diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-07-17 18:21:54 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-30 16:04:18 +0530 |
| commit | 2fc201a5da151d376ebf84dd4baea43380a7ccd7 (patch) | |
| tree | 6d4ec02dea12a66da0750e2f4ae8b7aaea15a146 /drivers/i2c | |
| parent | a45c245bd0e16a1480b2da2f4cee5766d9ed8d04 (diff) | |
i2c: tegra: rename dev_pm_ops variables/macro
To align the downstream to mainline, renaming the
variable/macro of dev_pm_ops as per mainline.
The original change on mainline is:
commit 6a7b3c3c465cef29d92dfc3fbbff0d958aa8be04
Author: Rafael J. Wysocki <rjw@sisk.pl>
i2c-tegra: Use struct dev_pm_ops for power management
Change-Id: Ica427ee339390a76ac8004bef96b4c12ef4ecae4
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/116465
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Tested-by: Bandi Krishna Chaitanya <bandik@nvidia.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index bb8d97b8f819..7e051df6bdab 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -1221,13 +1221,13 @@ static int tegra_i2c_resume_noirq(struct device *dev) return 0; } -static const struct dev_pm_ops tegra_i2c_dev_pm_ops = { +static const struct dev_pm_ops tegra_i2c_pm = { .suspend_noirq = tegra_i2c_suspend_noirq, .resume_noirq = tegra_i2c_resume_noirq, }; -#define TEGRA_I2C_DEV_PM_OPS (&tegra_i2c_dev_pm_ops) +#define TEGRA_I2C_PM (&tegra_i2c_pm) #else -#define TEGRA_I2C_DEV_PM_OPS NULL +#define TEGRA_I2C_PM NULL #endif static struct platform_driver tegra_i2c_driver = { @@ -1238,7 +1238,7 @@ static struct platform_driver tegra_i2c_driver = { .name = "tegra-i2c", .owner = THIS_MODULE, .of_match_table = of_match_ptr(tegra_i2c_of_match), - .pm = TEGRA_I2C_DEV_PM_OPS, + .pm = TEGRA_I2C_PM, }, }; |