|
@@ -713,9 +713,9 @@ static int __devexit tegra_i2c_remove(struct platform_device *pdev)
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
-static int tegra_i2c_suspend(struct platform_device *pdev, pm_message_t state)
|
|
|
+static int tegra_i2c_suspend(struct device *dev)
|
|
|
{
|
|
|
- struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
|
|
|
+ struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
|
|
|
|
|
|
i2c_lock_adapter(&i2c_dev->adapter);
|
|
|
i2c_dev->is_suspended = true;
|
|
@@ -724,9 +724,9 @@ static int tegra_i2c_suspend(struct platform_device *pdev, pm_message_t state)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int tegra_i2c_resume(struct platform_device *pdev)
|
|
|
+static int tegra_i2c_resume(struct device *dev)
|
|
|
{
|
|
|
- struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
|
|
|
+ struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
|
|
|
int ret;
|
|
|
|
|
|
i2c_lock_adapter(&i2c_dev->adapter);
|
|
@@ -744,6 +744,11 @@ static int tegra_i2c_resume(struct platform_device *pdev)
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
+
|
|
|
+static SIMPLE_DEV_PM_OPS(tegra_i2c_pm, tegra_i2c_suspend, tegra_i2c_resume);
|
|
|
+#define TEGRA_I2C_PM (&tegra_i2c_pm)
|
|
|
+#else
|
|
|
+#define TEGRA_I2C_PM NULL
|
|
|
#endif
|
|
|
|
|
|
#if defined(CONFIG_OF)
|
|
@@ -759,14 +764,11 @@ MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
|
|
|
static struct platform_driver tegra_i2c_driver = {
|
|
|
.probe = tegra_i2c_probe,
|
|
|
.remove = __devexit_p(tegra_i2c_remove),
|
|
|
-#ifdef CONFIG_PM
|
|
|
- .suspend = tegra_i2c_suspend,
|
|
|
- .resume = tegra_i2c_resume,
|
|
|
-#endif
|
|
|
.driver = {
|
|
|
.name = "tegra-i2c",
|
|
|
.owner = THIS_MODULE,
|
|
|
.of_match_table = of_match_ptr(tegra_i2c_of_match),
|
|
|
+ .pm = TEGRA_I2C_PM,
|
|
|
},
|
|
|
};
|
|
|
|