Merge with Linus' kernel.

[powerpc.git] / drivers / i2c / busses / i2c-mpc.c

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 9ad3e92..5ccd338 100644 (file)
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -19,6 +19,8 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/platform_device.h>
+
 #include <asm/io.h>
 #include <linux/fsl_devices.h>
 #include <linux/i2c.h>
@@ -272,8 +274,6 @@ static u32 mpc_functionality(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm mpc_algo = {
-       .name = "MPC algorithm",
-       .id = I2C_ALGO_MPC107,
        .master_xfer = mpc_xfer,
        .functionality = mpc_functionality,
 };
@@ -281,27 +281,25 @@ static struct i2c_algorithm mpc_algo = {
 static struct i2c_adapter mpc_ops = {
        .owner = THIS_MODULE,
        .name = "MPC adapter",
-       .id = I2C_ALGO_MPC107 | I2C_HW_MPC107,
+       .id = I2C_HW_MPC107,
        .algo = &mpc_algo,
        .class = I2C_CLASS_HWMON,
        .timeout = 1,
        .retries = 1
 };
 
-static int fsl_i2c_probe(struct device *device)
+static int fsl_i2c_probe(struct platform_device *pdev)
 {
        int result = 0;
        struct mpc_i2c *i2c;
-       struct platform_device *pdev = to_platform_device(device);
        struct fsl_i2c_platform_data *pdata;
        struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
        pdata = (struct fsl_i2c_platform_data *) pdev->dev.platform_data;
 
-       if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) {
+       if (!(i2c = kzalloc(sizeof(*i2c), GFP_KERNEL))) {
                return -ENOMEM;
        }
-       memset(i2c, 0, sizeof(*i2c));
 
        i2c->irq = platform_get_irq(pdev, 0);
        i2c->flags = pdata->device_flags;
@@ -324,7 +322,7 @@ static int fsl_i2c_probe(struct device *device)
                }
 
        mpc_i2c_setclock(i2c);
-       dev_set_drvdata(device, i2c);
+       platform_set_drvdata(pdev, i2c);
 
        i2c->adap = mpc_ops;
        i2c_set_adapdata(&i2c->adap, i2c);
@@ -346,12 +344,12 @@ static int fsl_i2c_probe(struct device *device)
        return result;
 };
 
-static int fsl_i2c_remove(struct device *device)
+static int fsl_i2c_remove(struct platform_device *pdev)
 {
-       struct mpc_i2c *i2c = dev_get_drvdata(device);
+       struct mpc_i2c *i2c = platform_get_drvdata(pdev);
 
        i2c_del_adapter(&i2c->adap);
-       dev_set_drvdata(device, NULL);
+       platform_set_drvdata(pdev, NULL);
 
        if (i2c->irq != 0)
                free_irq(i2c->irq, i2c);
@@ -362,21 +360,23 @@ static int fsl_i2c_remove(struct device *device)
 };
 
 /* Structure for a device driver */
-static struct device_driver fsl_i2c_driver = {
-       .name = "fsl-i2c",
-       .bus = &platform_bus_type,
+static struct platform_driver fsl_i2c_driver = {
        .probe = fsl_i2c_probe,
        .remove = fsl_i2c_remove,
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = "fsl-i2c",
+       },
 };
 
 static int __init fsl_i2c_init(void)
 {
-       return driver_register(&fsl_i2c_driver);
+       return platform_driver_register(&fsl_i2c_driver);
 }
 
 static void __exit fsl_i2c_exit(void)
 {
-       driver_unregister(&fsl_i2c_driver);
+       platform_driver_unregister(&fsl_i2c_driver);
 }
 
 module_init(fsl_i2c_init);