25 files changed, 120 insertions, 142 deletions

diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index ba90f5140af6..3eb47890db40 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -513,7 +513,6 @@ static void __devexit ali1535_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver ali1535_driver = {
-        .owner          = THIS_MODULE,
         .name           = "ali1535_smbus",
         .id_table       = ali1535_ids,
         .probe          = ali1535_probe,
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index f1a62d892425..e6f63208fc4a 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -408,7 +408,6 @@ static struct pci_device_id __devinitdata ali1563_id_table[] = {
 MODULE_DEVICE_TABLE (pci, ali1563_id_table);
 
 static struct pci_driver ali1563_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "ali1563_smbus",
         .id_table       = ali1563_id_table,
         .probe          = ali1563_probe,
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 400b08ed4299..7a5c0941dbc1 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -504,7 +504,6 @@ static void __devexit ali15x3_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver ali15x3_driver = {
-        .owner          = THIS_MODULE,
         .name           = "ali15x3_smbus",
         .id_table       = ali15x3_ids,
         .probe          = ali15x3_probe,
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index de035d137c3f..1750dedaf4b5 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -401,7 +401,6 @@ static void __devexit amd756_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver amd756_driver = {
-        .owner          = THIS_MODULE,
         .name           = "amd756_smbus",
         .id_table       = amd756_ids,
         .probe          = amd756_probe,
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index f3b79a68dbec..e5ef560e686a 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -384,7 +384,6 @@ static void __devexit amd8111_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver amd8111_driver = {
-        .owner          = THIS_MODULE,
         .name           = "amd8111_smbus2",
         .id_table       = amd8111_ids,
         .probe          = amd8111_probe,
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c
index 1b5354e24bf5..e0cb3b0f92fa 100644
--- a/drivers/i2c/busses/i2c-hydra.c
+++ b/drivers/i2c/busses/i2c-hydra.c
@@ -155,7 +155,6 @@ static void __devexit hydra_remove(struct pci_dev *dev)
 
 
 static struct pci_driver hydra_driver = {
-        .owner          = THIS_MODULE,
         .name           = "hydra_smbus",
         .id_table       = hydra_ids,
         .probe          = hydra_probe,
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 4f63195069da..ac3eafa8aac0 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -560,7 +560,6 @@ static void __devexit i801_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver i801_driver = {
-        .owner          = THIS_MODULE,
         .name           = "i801_smbus",
         .id_table       = i801_ids,
         .probe          = i801_probe,
diff --git a/drivers/i2c/busses/i2c-i810.c b/drivers/i2c/busses/i2c-i810.c
index 52bc30593bd7..748be30f2bae 100644
--- a/drivers/i2c/busses/i2c-i810.c
+++ b/drivers/i2c/busses/i2c-i810.c
@@ -233,7 +233,6 @@ static void __devexit i810_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver i810_driver = {
-        .owner          = THIS_MODULE,
         .name           = "i810_smbus",
         .id_table       = i810_ids,
         .probe          = i810_probe,
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index cfae4ad00fae..1414851a17b8 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -405,10 +405,9 @@ static struct i2c_algorithm iop3xx_i2c_algo = {
 };
 
 static int 
-iop3xx_i2c_remove(struct device *device)
+iop3xx_i2c_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(device);
-        struct i2c_adapter *padapter = dev_get_drvdata(&pdev->dev);
+        struct i2c_adapter *padapter = platform_get_drvdata(pdev);
         struct i2c_algo_iop3xx_data *adapter_data = 
                 (struct i2c_algo_iop3xx_data *)padapter->algo_data;
         struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -426,15 +425,14 @@ iop3xx_i2c_remove(struct device *device)
         kfree(adapter_data);
         kfree(padapter);
 
-        dev_set_drvdata(&pdev->dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         return 0;
 }
 
 static int 
-iop3xx_i2c_probe(struct device *dev)
+iop3xx_i2c_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct resource *res;
         int ret;
         struct i2c_adapter *new_adapter;
@@ -499,7 +497,7 @@ iop3xx_i2c_probe(struct device *dev)
         iop3xx_i2c_set_slave_addr(adapter_data);
         iop3xx_i2c_enable(adapter_data);
 
-        dev_set_drvdata(&pdev->dev, new_adapter);
+        platform_set_drvdata(pdev, new_adapter);
         new_adapter->algo_data = adapter_data;
 
         i2c_add_adapter(new_adapter);
@@ -523,24 +521,25 @@ out:
 }
 
 
-static struct device_driver iop3xx_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "IOP3xx-I2C",
-        .bus            = &platform_bus_type,
+static struct platform_driver iop3xx_i2c_driver = {
         .probe          = iop3xx_i2c_probe,
-        .remove         = iop3xx_i2c_remove
+        .remove         = iop3xx_i2c_remove,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "IOP3xx-I2C",
+        },
 };
 
 static int __init 
 i2c_iop3xx_init (void)
 {
-        return driver_register(&iop3xx_i2c_driver);
+        return platform_driver_register(&iop3xx_i2c_driver);
 }
 
 static void __exit 
 i2c_iop3xx_exit (void)
 {
-        driver_unregister(&iop3xx_i2c_driver);
+        platform_driver_unregister(&iop3xx_i2c_driver);
         return;
 }
 
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c
index 64552a376f2d..cd6f45d186ab 100644
--- a/drivers/i2c/busses/i2c-ixp2000.c
+++ b/drivers/i2c/busses/i2c-ixp2000.c
@@ -36,8 +36,6 @@
 #include <asm/hardware.h>       /* Pick up IXP2000-specific bits */
 #include <asm/arch/gpio.h>
 
-static struct device_driver ixp2000_i2c_driver;
-
 static inline int ixp2000_scl_pin(void *data)
 {
         return ((struct ixp2000_i2c_pins*)data)->scl_pin;
@@ -86,12 +84,11 @@ struct ixp2000_i2c_data {
         struct i2c_algo_bit_data algo_data;
 };
 
-static int ixp2000_i2c_remove(struct device *dev)
+static int ixp2000_i2c_remove(struct platform_device *plat_dev)
 {
-        struct platform_device *plat_dev = to_platform_device(dev);
-        struct ixp2000_i2c_data *drv_data = dev_get_drvdata(&plat_dev->dev);
+        struct ixp2000_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);
 
@@ -100,10 +97,9 @@ static int ixp2000_i2c_remove(struct device *dev)
         return 0;
 }
 
-static int ixp2000_i2c_probe(struct device *dev)
+static int ixp2000_i2c_probe(struct platform_device *plat_dev)
 {
         int err;
-        struct platform_device *plat_dev = to_platform_device(dev);
         struct ixp2000_i2c_pins *gpio = plat_dev->dev.platform_data;
         struct ixp2000_i2c_data *drv_data = 
                 kzalloc(sizeof(struct ixp2000_i2c_data), GFP_KERNEL);
@@ -122,7 +118,7 @@ static int ixp2000_i2c_probe(struct device *dev)
         drv_data->algo_data.timeout = 100;
 
         drv_data->adapter.id = I2C_HW_B_IXP2000,
-        strlcpy(drv_data->adapter.name, ixp2000_i2c_driver.name,
+        strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
                 I2C_NAME_SIZE);
         drv_data->adapter.algo_data = &drv_data->algo_data,
 
@@ -134,32 +130,33 @@ static int ixp2000_i2c_probe(struct device *dev)
         gpio_line_set(gpio->sda_pin, 0);
 
         if ((err = i2c_bit_add_bus(&drv_data->adapter)) != 0) {
-                dev_err(dev, "Could not install, error %d\n", err);
+                dev_err(&plat_dev->dev, "Could not install, error %d\n", err);
                 kfree(drv_data);
                 return err;
         } 
 
-        dev_set_drvdata(&plat_dev->dev, drv_data);
+        platform_set_drvdata(plat_dev, drv_data);
 
         return 0;
 }
 
-static struct device_driver ixp2000_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "IXP2000-I2C",
-        .bus            = &platform_bus_type,
+static struct platform_driver ixp2000_i2c_driver = {
         .probe          = ixp2000_i2c_probe,
         .remove         = ixp2000_i2c_remove,
+        .driver         = {
+                .name   = "IXP2000-I2C",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init ixp2000_i2c_init(void)
 {
-        return driver_register(&ixp2000_i2c_driver);
+        return platform_driver_register(&ixp2000_i2c_driver);
 }
 
 static void __exit ixp2000_i2c_exit(void)
 {
-        driver_unregister(&ixp2000_i2c_driver);
+        platform_driver_unregister(&ixp2000_i2c_driver);
 }
 
 module_init(ixp2000_i2c_init);
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index cc652c350814..e422d8b2d4d6 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -35,8 +35,6 @@
 
 #include <asm/hardware.h>       /* Pick up IXP4xx-specific bits */
 
-static struct device_driver ixp4xx_i2c_driver;
-
 static inline int ixp4xx_scl_pin(void *data)
 {
         return ((struct ixp4xx_i2c_pins*)data)->scl_pin;
@@ -87,12 +85,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 +98,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);
@@ -130,7 +126,7 @@ static int ixp4xx_i2c_probe(struct device *dev)
         drv_data->algo_data.timeout = 100;
 
         drv_data->adapter.id = I2C_HW_B_IXP4XX;
-        strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.name,
+        strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
                 I2C_NAME_SIZE);
         drv_data->adapter.algo_data = &drv_data->algo_data;
 
@@ -142,33 +138,34 @@ static int ixp4xx_i2c_probe(struct device *dev)
         gpio_line_set(gpio->sda_pin, 0);
 
         if ((err = i2c_bit_add_bus(&drv_data->adapter) != 0)) {
-                printk(KERN_ERR "ERROR: Could not install %s\n", dev->bus_id);
+                printk(KERN_ERR "ERROR: Could not install %s\n", plat_dev->dev.bus_id);
 
                 kfree(drv_data);
                 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);
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 65b939a059e9..5ccd338a9dc9 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -288,11 +288,10 @@ static struct i2c_adapter mpc_ops = {
         .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);
 
@@ -323,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);
@@ -345,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);
@@ -361,22 +360,23 @@ static int fsl_i2c_remove(struct device *device)
 };
 
 /* Structure for a device driver */
-static struct device_driver fsl_i2c_driver = {
-        .owner = THIS_MODULE,
-        .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);
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 6b48027b2ee3..81031eb51056 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -492,11 +492,10 @@ mv64xxx_i2c_unmap_regs(struct mv64xxx_i2c_data *drv_data)
 }
 
 static int __devinit
-mv64xxx_i2c_probe(struct device *dev)
+mv64xxx_i2c_probe(struct platform_device *pd)
 {
-        struct platform_device          *pd = to_platform_device(dev);
         struct mv64xxx_i2c_data         *drv_data;
-        struct mv64xxx_i2c_pdata        *pdata = dev->platform_data;
+        struct mv64xxx_i2c_pdata        *pdata = pd->dev.platform_data;
         int     rc;
 
         if ((pd->id != 0) || !pdata)
@@ -526,18 +525,19 @@ mv64xxx_i2c_probe(struct device *dev)
         drv_data->adapter.class = I2C_CLASS_HWMON;
         drv_data->adapter.timeout = pdata->timeout;
         drv_data->adapter.retries = pdata->retries;
-        dev_set_drvdata(dev, drv_data);
+        platform_set_drvdata(pd, drv_data);
         i2c_set_adapdata(&drv_data->adapter, drv_data);
 
         if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0,
-                MV64XXX_I2C_CTLR_NAME, drv_data)) {
-
-                dev_err(dev, "mv64xxx: Can't register intr handler "
-                        "irq: %d\n", drv_data->irq);
+                        MV64XXX_I2C_CTLR_NAME, drv_data)) {
+                dev_err(&drv_data->adapter.dev,
+                        "mv64xxx: Can't register intr handler irq: %d\n",
+                        drv_data->irq);
                 rc = -EINVAL;
                 goto exit_unmap_regs;
         } else if ((rc = i2c_add_adapter(&drv_data->adapter)) != 0) {
-                dev_err(dev, "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc);
+                dev_err(&drv_data->adapter.dev,
+                        "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc);
                 goto exit_free_irq;
         }
 
@@ -555,9 +555,9 @@ mv64xxx_i2c_probe(struct device *dev)
 }
 
 static int __devexit
-mv64xxx_i2c_remove(struct device *dev)
+mv64xxx_i2c_remove(struct platform_device *dev)
 {
-        struct mv64xxx_i2c_data         *drv_data = dev_get_drvdata(dev);
+        struct mv64xxx_i2c_data         *drv_data = platform_get_drvdata(dev);
         int     rc;
 
         rc = i2c_del_adapter(&drv_data->adapter);
@@ -568,24 +568,25 @@ mv64xxx_i2c_remove(struct device *dev)
         return rc;
 }
 
-static struct device_driver mv64xxx_i2c_driver = {
-        .owner  = THIS_MODULE,
-        .name   = MV64XXX_I2C_CTLR_NAME,
-        .bus    = &platform_bus_type,
+static struct platform_driver mv64xxx_i2c_driver = {
         .probe  = mv64xxx_i2c_probe,
         .remove = mv64xxx_i2c_remove,
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = MV64XXX_I2C_CTLR_NAME,
+        },
 };
 
 static int __init
 mv64xxx_i2c_init(void)
 {
-        return driver_register(&mv64xxx_i2c_driver);
+        return platform_driver_register(&mv64xxx_i2c_driver);
 }
 
 static void __exit
 mv64xxx_i2c_exit(void)
 {
-        driver_unregister(&mv64xxx_i2c_driver);
+        platform_driver_unregister(&mv64xxx_i2c_driver);
 }
 
 module_init(mv64xxx_i2c_init);
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index fd26036e68a3..4d18e6e5f159 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -347,7 +347,6 @@ static void __devexit nforce2_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver nforce2_driver = {
-        .owner          = THIS_MODULE,
         .name           = "nForce2_smbus",
         .id_table       = nforce2_ids,
         .probe          = nforce2_probe,
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 7d63eec423fe..692f47345481 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -462,7 +462,6 @@ static void __devexit piix4_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver piix4_driver = {
-        .owner          = THIS_MODULE,
         .name           = "piix4_smbus",
         .id_table       = piix4_ids,
         .probe          = piix4_probe,
diff --git a/drivers/i2c/busses/i2c-prosavage.c b/drivers/i2c/busses/i2c-prosavage.c
index 42cb1d8ca659..9479525892e3 100644
--- a/drivers/i2c/busses/i2c-prosavage.c
+++ b/drivers/i2c/busses/i2c-prosavage.c
@@ -301,7 +301,6 @@ static struct pci_device_id prosavage_pci_tbl[] = {
 MODULE_DEVICE_TABLE (pci, prosavage_pci_tbl);
 
 static struct pci_driver prosavage_driver = {
-        .owner          =       THIS_MODULE,
         .name           =       "prosavage_smbus",
         .id_table       =       prosavage_pci_tbl,
         .probe          =       prosavage_probe,
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 67ccbea24ba4..70f7ab829d36 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -936,10 +936,10 @@ static struct pxa_i2c i2c_pxa = {
         },
 };
 
-static int i2c_pxa_probe(struct device *dev)
+static int i2c_pxa_probe(struct platform_device *dev)
 {
         struct pxa_i2c *i2c = &i2c_pxa;
-        struct i2c_pxa_platform_data *plat = dev->platform_data;
+        struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
         int ret;
 
 #ifdef CONFIG_PXA27x
@@ -968,7 +968,7 @@ static int i2c_pxa_probe(struct device *dev)
         i2c_pxa_reset(i2c);
 
         i2c->adap.algo_data = i2c;
-        i2c->adap.dev.parent = dev;
+        i2c->adap.dev.parent = &dev->dev;
 
         ret = i2c_add_adapter(&i2c->adap);
         if (ret < 0) {
@@ -976,7 +976,7 @@ static int i2c_pxa_probe(struct device *dev)
                 goto err_irq;
         }
 
-        dev_set_drvdata(dev, i2c);
+        platform_set_drvdata(dev, i2c);
 
 #ifdef CONFIG_I2C_PXA_SLAVE
         printk(KERN_INFO "I2C: %s: PXA I2C adapter, slave address %d\n",
@@ -993,11 +993,11 @@ static int i2c_pxa_probe(struct device *dev)
         return ret;
 }
 
-static int i2c_pxa_remove(struct device *dev)
+static int i2c_pxa_remove(struct platform_device *dev)
 {
-        struct pxa_i2c *i2c = dev_get_drvdata(dev);
+        struct pxa_i2c *i2c = platform_get_drvdata(dev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         i2c_del_adapter(&i2c->adap);
         free_irq(IRQ_I2C, i2c);
@@ -1006,21 +1006,22 @@ static int i2c_pxa_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver i2c_pxa_driver = {
-        .name           = "pxa2xx-i2c",
-        .bus            = &platform_bus_type,
+static struct platform_driver i2c_pxa_driver = {
         .probe          = i2c_pxa_probe,
         .remove         = i2c_pxa_remove,
+        .driver         = {
+                .name   = "pxa2xx-i2c",
+        },
 };
 
 static int __init i2c_adap_pxa_init(void)
 {
-        return driver_register(&i2c_pxa_driver);
+        return platform_driver_register(&i2c_pxa_driver);
 }
 
 static void i2c_adap_pxa_exit(void)
 {
-        return driver_unregister(&i2c_pxa_driver);
+        return platform_driver_unregister(&i2c_pxa_driver);
 }
 
 module_init(i2c_adap_pxa_init);
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 1b582262e677..58cfd3111ef6 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -760,24 +760,23 @@ static void s3c24xx_i2c_free(struct s3c24xx_i2c *i2c)
  * called by the bus driver when a suitable device is found
 */
 
-static int s3c24xx_i2c_probe(struct device *dev)
+static int s3c24xx_i2c_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct s3c24xx_i2c *i2c = &s3c24xx_i2c;
         struct resource *res;
         int ret;
 
         /* find the clock and enable it */
 
-        i2c->dev = dev;
-        i2c->clk = clk_get(dev, "i2c");
+        i2c->dev = &pdev->dev;
+        i2c->clk = clk_get(&pdev->dev, "i2c");
         if (IS_ERR(i2c->clk)) {
-                dev_err(dev, "cannot get clock\n");
+                dev_err(&pdev->dev, "cannot get clock\n");
                 ret = -ENOENT;
                 goto out;
         }
 
-        dev_dbg(dev, "clock source %p\n", i2c->clk);
+        dev_dbg(&pdev->dev, "clock source %p\n", i2c->clk);
 
         clk_use(i2c->clk);
         clk_enable(i2c->clk);
@@ -786,7 +785,7 @@ static int s3c24xx_i2c_probe(struct device *dev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
-                dev_err(dev, "cannot find IO resource\n");
+                dev_err(&pdev->dev, "cannot find IO resource\n");
                 ret = -ENOENT;
                 goto out;
         }
@@ -795,7 +794,7 @@ static int s3c24xx_i2c_probe(struct device *dev)
                                          pdev->name);
 
         if (i2c->ioarea == NULL) {
-                dev_err(dev, "cannot request IO\n");
+                dev_err(&pdev->dev, "cannot request IO\n");
                 ret = -ENXIO;
                 goto out;
         }
@@ -803,17 +802,17 @@ static int s3c24xx_i2c_probe(struct device *dev)
         i2c->regs = ioremap(res->start, (res->end-res->start)+1);
 
         if (i2c->regs == NULL) {
-                dev_err(dev, "cannot map IO\n");
+                dev_err(&pdev->dev, "cannot map IO\n");
                 ret = -ENXIO;
                 goto out;
         }
 
-        dev_dbg(dev, "registers %p (%p, %p)\n", i2c->regs, i2c->ioarea, res);
+        dev_dbg(&pdev->dev, "registers %p (%p, %p)\n", i2c->regs, i2c->ioarea, res);
 
         /* setup info block for the i2c core */
 
         i2c->adap.algo_data = i2c;
-        i2c->adap.dev.parent = dev;
+        i2c->adap.dev.parent = &pdev->dev;
 
         /* initialise the i2c controller */
 
@@ -827,7 +826,7 @@ static int s3c24xx_i2c_probe(struct device *dev)
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (res == NULL) {
-                dev_err(dev, "cannot find IRQ\n");
+                dev_err(&pdev->dev, "cannot find IRQ\n");
                 ret = -ENOENT;
                 goto out;
         }
@@ -836,23 +835,23 @@ static int s3c24xx_i2c_probe(struct device *dev)
                           pdev->name, i2c);
 
         if (ret != 0) {
-                dev_err(dev, "cannot claim IRQ\n");
+                dev_err(&pdev->dev, "cannot claim IRQ\n");
                 goto out;
         }
 
         i2c->irq = res;
                 
-        dev_dbg(dev, "irq resource %p (%ld)\n", res, res->start);
+        dev_dbg(&pdev->dev, "irq resource %p (%ld)\n", res, res->start);
 
         ret = i2c_add_adapter(&i2c->adap);
         if (ret < 0) {
-                dev_err(dev, "failed to add bus to i2c core\n");
+                dev_err(&pdev->dev, "failed to add bus to i2c core\n");
                 goto out;
         }
 
-        dev_set_drvdata(dev, i2c);
+        platform_set_drvdata(pdev, i2c);
 
-        dev_info(dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id);
+        dev_info(&pdev->dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id);
 
  out:
         if (ret < 0)
@@ -866,22 +865,22 @@ static int s3c24xx_i2c_probe(struct device *dev)
  * called when device is removed from the bus
 */
 
-static int s3c24xx_i2c_remove(struct device *dev)
+static int s3c24xx_i2c_remove(struct platform_device *pdev)
 {
-        struct s3c24xx_i2c *i2c = dev_get_drvdata(dev);
+        struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
         
         if (i2c != NULL) {
                 s3c24xx_i2c_free(i2c);
-                dev_set_drvdata(dev, NULL);
+                platform_set_drvdata(pdev, NULL);
         }
 
         return 0;
 }
 
 #ifdef CONFIG_PM
-static int s3c24xx_i2c_resume(struct device *dev)
+static int s3c24xx_i2c_resume(struct platform_device *dev)
 {
-        struct s3c24xx_i2c *i2c = dev_get_drvdata(dev);
+        struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
 
         if (i2c != NULL)
                 s3c24xx_i2c_init(i2c);
@@ -895,33 +894,35 @@ static int s3c24xx_i2c_resume(struct device *dev)
 
 /* device driver for platform bus bits */
 
-static struct device_driver s3c2410_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "s3c2410-i2c",
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410_i2c_driver = {
         .probe          = s3c24xx_i2c_probe,
         .remove         = s3c24xx_i2c_remove,
         .resume         = s3c24xx_i2c_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "s3c2410-i2c",
+        },
 };
 
-static struct device_driver s3c2440_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "s3c2440-i2c",
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2440_i2c_driver = {
         .probe          = s3c24xx_i2c_probe,
         .remove         = s3c24xx_i2c_remove,
         .resume         = s3c24xx_i2c_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "s3c2440-i2c",
+        },
 };
 
 static int __init i2c_adap_s3c_init(void)
 {
         int ret;
 
-        ret = driver_register(&s3c2410_i2c_driver);
+        ret = platform_driver_register(&s3c2410_i2c_driver);
         if (ret == 0) {
-                ret = driver_register(&s3c2440_i2c_driver);
+                ret = platform_driver_register(&s3c2440_i2c_driver);
                 if (ret)
-                        driver_unregister(&s3c2410_i2c_driver);
+                        platform_driver_unregister(&s3c2410_i2c_driver);
         }
 
         return ret;
@@ -929,8 +930,8 @@ static int __init i2c_adap_s3c_init(void)
 
 static void __exit i2c_adap_s3c_exit(void)
 {
-        driver_unregister(&s3c2410_i2c_driver);
-        driver_unregister(&s3c2440_i2c_driver);
+        platform_driver_unregister(&s3c2410_i2c_driver);
+        platform_driver_unregister(&s3c2440_i2c_driver);
 }
 
 module_init(i2c_adap_s3c_init);
diff --git a/drivers/i2c/busses/i2c-savage4.c b/drivers/i2c/busses/i2c-savage4.c
index aebe87ba4033..0c8518298e4d 100644
--- a/drivers/i2c/busses/i2c-savage4.c
+++ b/drivers/i2c/busses/i2c-savage4.c
@@ -179,7 +179,6 @@ static void __devexit savage4_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver savage4_driver = {
-        .owner          = THIS_MODULE,
         .name           = "savage4_smbus",
         .id_table       = savage4_ids,
         .probe          = savage4_probe,
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 3ad27c3ba15b..b57ab74d23ec 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -398,7 +398,6 @@ static void __devexit sis5595_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver sis5595_driver = {
-        .owner          = THIS_MODULE,
         .name           = "sis5595_smbus",
         .id_table       = sis5595_ids,
         .probe          = sis5595_probe,
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 7f49e5fd3ff0..acb75e282414 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -496,7 +496,6 @@ static void __devexit sis630_remove(struct pci_dev *dev)
 
 
 static struct pci_driver sis630_driver = {
-        .owner          = THIS_MODULE,
         .name           = "sis630_smbus",
         .id_table       = sis630_ids,
         .probe          = sis630_probe,
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 6a134c091324..3024907cdafe 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -329,7 +329,6 @@ static void __devexit sis96x_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver sis96x_driver = {
-        .owner          = THIS_MODULE,
         .name           = "sis96x_smbus",
         .id_table       = sis96x_ids,
         .probe          = sis96x_probe,
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 544a38e64394..484bbacfce6b 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -159,7 +159,6 @@ static void __devexit vt586b_remove(struct pci_dev *dev)
 
 
 static struct pci_driver vt586b_driver = {
-        .owner          = THIS_MODULE,
         .name           = "vt586b_smbus",
         .id_table       = vt586b_ids,
         .probe          = vt586b_probe,
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index a2237d4b2cf2..47e52bf2c5ec 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -440,7 +440,6 @@ static struct pci_device_id vt596_ids[] = {
 MODULE_DEVICE_TABLE(pci, vt596_ids);
 
 static struct pci_driver vt596_driver = {
-        .owner          = THIS_MODULE,
         .name           = "vt596_smbus",
         .id_table       = vt596_ids,
         .probe          = vt596_probe,
diff --git a/drivers/i2c/busses/i2c-voodoo3.c b/drivers/i2c/busses/i2c-voodoo3.c
index 650c3ebde84c..b675773b0cc1 100644
--- a/drivers/i2c/busses/i2c-voodoo3.c
+++ b/drivers/i2c/busses/i2c-voodoo3.c
@@ -225,7 +225,6 @@ static void __devexit voodoo3_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver voodoo3_driver = {
-        .owner          = THIS_MODULE,
         .name           = "voodoo3_smbus",
         .id_table       = voodoo3_ids,
         .probe          = voodoo3_probe,