1 files changed, 12 insertions, 13 deletions

diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index cc652c350814..aa36855fa995 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -87,12 +87,11 @@ struct ixp4xx_i2c_data {
         struct i2c_algo_bit_data algo_data;
 };
 
-static int ixp4xx_i2c_remove(struct device *dev)
+static int ixp4xx_i2c_remove(struct platform_device *plat_dev)
 {
-        struct platform_device *plat_dev = to_platform_device(dev);
-        struct ixp4xx_i2c_data *drv_data = dev_get_drvdata(&plat_dev->dev);
+        struct ixp4xx_i2c_data *drv_data = platform_get_drvdata(plat_dev);
 
-        dev_set_drvdata(&plat_dev->dev, NULL);
+        platform_set_drvdata(plat_dev, NULL);
 
         i2c_bit_del_bus(&drv_data->adapter);
 
@@ -101,10 +100,9 @@ static int ixp4xx_i2c_remove(struct device *dev)
         return 0;
 }
 
-static int ixp4xx_i2c_probe(struct device *dev)
+static int ixp4xx_i2c_probe(struct platform_device *plat_dev)
 {
         int err;
-        struct platform_device *plat_dev = to_platform_device(dev);
         struct ixp4xx_i2c_pins *gpio = plat_dev->dev.platform_data;
         struct ixp4xx_i2c_data *drv_data = 
                 kzalloc(sizeof(struct ixp4xx_i2c_data), GFP_KERNEL);
@@ -148,27 +146,28 @@ static int ixp4xx_i2c_probe(struct device *dev)
                 return err;
         }
 
-        dev_set_drvdata(&plat_dev->dev, drv_data);
+        platform_set_drvdata(plat_dev, drv_data);
 
         return 0;
 }
 
-static struct device_driver ixp4xx_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "IXP4XX-I2C",
-        .bus            = &platform_bus_type,
+static struct platform_driver ixp4xx_i2c_driver = {
         .probe          = ixp4xx_i2c_probe,
         .remove         = ixp4xx_i2c_remove,
+        .driver         = {
+                .name   = "IXP4XX-I2C",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init ixp4xx_i2c_init(void)
 {
-        return driver_register(&ixp4xx_i2c_driver);
+        return platform_driver_register(&ixp4xx_i2c_driver);
 }
 
 static void __exit ixp4xx_i2c_exit(void)
 {
-        driver_unregister(&ixp4xx_i2c_driver);
+        platform_driver_unregister(&ixp4xx_i2c_driver);
 }
 
 module_init(ixp4xx_i2c_init);