diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-07-10 07:20:44 -0400 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-07-12 06:33:45 -0400 |
commit | 7c86d44cda2e715bc95f525fd0eac4bd6a66998e (patch) | |
tree | 00297bd1926b19e5c450ee67cace4fd487a01fdd /drivers/i2c | |
parent | 6a7b3c3c465cef29d92dfc3fbbff0d958aa8be04 (diff) |
i2c: tegra: convert normal suspend/resume to *_noirq
To provide the late suspend and early resume for i2c
driver, convert the suspend/resume as
suspend-> suspend_noirq
resume -> resume_noirq
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
[wsa: fixed up to match previous pm_ops change]
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index f85dee549e21..f179f88aa71a 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c | |||
@@ -713,7 +713,7 @@ static int __devexit tegra_i2c_remove(struct platform_device *pdev) | |||
713 | } | 713 | } |
714 | 714 | ||
715 | #ifdef CONFIG_PM | 715 | #ifdef CONFIG_PM |
716 | static int tegra_i2c_suspend(struct device *dev) | 716 | static int tegra_i2c_suspend_noirq(struct device *dev) |
717 | { | 717 | { |
718 | struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev); | 718 | struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev); |
719 | 719 | ||
@@ -724,7 +724,7 @@ static int tegra_i2c_suspend(struct device *dev) | |||
724 | return 0; | 724 | return 0; |
725 | } | 725 | } |
726 | 726 | ||
727 | static int tegra_i2c_resume(struct device *dev) | 727 | static int tegra_i2c_resume_noirq(struct device *dev) |
728 | { | 728 | { |
729 | struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev); | 729 | struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev); |
730 | int ret; | 730 | int ret; |
@@ -745,7 +745,10 @@ static int tegra_i2c_resume(struct device *dev) | |||
745 | return 0; | 745 | return 0; |
746 | } | 746 | } |
747 | 747 | ||
748 | static SIMPLE_DEV_PM_OPS(tegra_i2c_pm, tegra_i2c_suspend, tegra_i2c_resume); | 748 | static const struct dev_pm_ops tegra_i2c_pm = { |
749 | .suspend_noirq = tegra_i2c_suspend_noirq, | ||
750 | .resume_noirq = tegra_i2c_resume_noirq, | ||
751 | }; | ||
749 | #define TEGRA_I2C_PM (&tegra_i2c_pm) | 752 | #define TEGRA_I2C_PM (&tegra_i2c_pm) |
750 | #else | 753 | #else |
751 | #define TEGRA_I2C_PM NULL | 754 | #define TEGRA_I2C_PM NULL |