Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[sfrench/cifs-2.6.git] / drivers / i2c / busses / i2c-pxa.c

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 6cf333ecc8b83fc8afcf1800ea90dd40b4d4ae5b..600d264e080c5f05031cbeb7c8f6ac2907f25ba4 100644 (file)
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1346,8 +1346,7 @@ static int i2c_pxa_remove(struct platform_device *dev)
 #ifdef CONFIG_PM
 static int i2c_pxa_suspend_noirq(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct pxa_i2c *i2c = platform_get_drvdata(pdev);
+       struct pxa_i2c *i2c = dev_get_drvdata(dev);
 
        clk_disable(i2c->clk);
 
@@ -1356,8 +1355,7 @@ static int i2c_pxa_suspend_noirq(struct device *dev)
 
 static int i2c_pxa_resume_noirq(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct pxa_i2c *i2c = platform_get_drvdata(pdev);
+       struct pxa_i2c *i2c = dev_get_drvdata(dev);
 
        clk_enable(i2c->clk);
        i2c_pxa_reset(i2c);