From 60a70596fb8676bad8a72a8fb6cfd7b22dee50cc Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Tue, 17 Jul 2012 18:21:54 +0530 Subject: 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 i2c-tegra: Use struct dev_pm_ops for power management Change-Id: Ica427ee339390a76ac8004bef96b4c12ef4ecae4 Signed-off-by: Laxman Dewangan Reviewed-on: http://git-master/r/116465 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bitan Biswas Tested-by: Bandi Krishna Chaitanya --- drivers/i2c/busses/i2c-tegra.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/i2c/busses/i2c-tegra.c') diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index ff31683fef32..ac2f744c689d 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -1088,13 +1088,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 #if defined(CONFIG_OF) @@ -1113,7 +1113,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, }, }; -- cgit v1.2.3