Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[~andy/linux] / drivers / i2c / busses / i2c-cpm.c

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 9e6002108720e4169ae771ce6387176217351ebc..2e1f7eb55bf4a6f6d525db8548928daa39cbd1f2 100644 (file)
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -654,7 +654,7 @@ static int cpm_i2c_probe(struct platform_device *ofdev)
 
        cpm->ofdev = ofdev;
 
-       dev_set_drvdata(&ofdev->dev, cpm);
+       platform_set_drvdata(ofdev, cpm);
 
        cpm->adap = cpm_ops;
        i2c_set_adapdata(&cpm->adap, cpm);
@@ -697,7 +697,7 @@ out_free:
 
 static int cpm_i2c_remove(struct platform_device *ofdev)
 {
-       struct cpm_i2c *cpm = dev_get_drvdata(&ofdev->dev);
+       struct cpm_i2c *cpm = platform_get_drvdata(ofdev);
 
        i2c_del_adapter(&cpm->adap);