216 files changed, 3256 insertions, 7508 deletions

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 3937adf4e5e5..aa993715d644 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -203,6 +203,7 @@ acpi_handle acpi_get_pci_rootbridge_handle(unsigned int seg, unsigned int bus)
         acpi_get_devices(PCI_ROOT_HID_STRING, find_pci_rootbridge, &find, NULL);
         return find.handle;
 }
+EXPORT_SYMBOL_GPL(acpi_get_pci_rootbridge_handle);
 
 /* Get device's handler per its address under its parent */
 struct acpi_find_child {
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 0cded0468003..821c81e8cd38 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -1511,8 +1511,8 @@ static inline short setup_idle_tx_channel (hrz_dev * dev, hrz_vcc * vcc) {
     // a.k.a. prepare the channel and remember that we have done so.
     
     tx_ch_desc * tx_desc = &memmap->tx_descs[tx_channel];
-    u16 rd_ptr;
-    u16 wr_ptr;
+    u32 rd_ptr;
+    u32 wr_ptr;
     u16 channel = vcc->channel;
     
     unsigned long flags;
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 6d4736e89f1a..8827dafba945 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -20,6 +20,8 @@
 
 #include "base.h"
 
+#define to_platform_driver(drv) (container_of((drv), struct platform_driver, driver))
+
 struct device platform_bus = {
         .bus_id         = "platform",
 };
@@ -354,6 +356,77 @@ error:
         return ERR_PTR(retval);
 }
 
+static int platform_drv_probe(struct device *_dev)
+{
+        struct platform_driver *drv = to_platform_driver(_dev->driver);
+        struct platform_device *dev = to_platform_device(_dev);
+
+        return drv->probe(dev);
+}
+
+static int platform_drv_remove(struct device *_dev)
+{
+        struct platform_driver *drv = to_platform_driver(_dev->driver);
+        struct platform_device *dev = to_platform_device(_dev);
+
+        return drv->remove(dev);
+}
+
+static void platform_drv_shutdown(struct device *_dev)
+{
+        struct platform_driver *drv = to_platform_driver(_dev->driver);
+        struct platform_device *dev = to_platform_device(_dev);
+
+        drv->shutdown(dev);
+}
+
+static int platform_drv_suspend(struct device *_dev, pm_message_t state)
+{
+        struct platform_driver *drv = to_platform_driver(_dev->driver);
+        struct platform_device *dev = to_platform_device(_dev);
+
+        return drv->suspend(dev, state);
+}
+
+static int platform_drv_resume(struct device *_dev)
+{
+        struct platform_driver *drv = to_platform_driver(_dev->driver);
+        struct platform_device *dev = to_platform_device(_dev);
+
+        return drv->resume(dev);
+}
+
+/**
+ *      platform_driver_register
+ *      @drv: platform driver structure
+ */
+int platform_driver_register(struct platform_driver *drv)
+{
+        drv->driver.bus = &platform_bus_type;
+        if (drv->probe)
+                drv->driver.probe = platform_drv_probe;
+        if (drv->remove)
+                drv->driver.remove = platform_drv_remove;
+        if (drv->shutdown)
+                drv->driver.shutdown = platform_drv_shutdown;
+        if (drv->suspend)
+                drv->driver.suspend = platform_drv_suspend;
+        if (drv->resume)
+                drv->driver.resume = platform_drv_resume;
+        return driver_register(&drv->driver);
+}
+EXPORT_SYMBOL_GPL(platform_driver_register);
+
+/**
+ *      platform_driver_unregister
+ *      @drv: platform driver structure
+ */
+void platform_driver_unregister(struct platform_driver *drv)
+{
+        driver_unregister(&drv->driver);
+}
+EXPORT_SYMBOL_GPL(platform_driver_unregister);
+
 
 /**
  *      platform_match - bind platform device to platform driver.
diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
index ba54b5872578..b02fc2267159 100644
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
@@ -389,7 +389,6 @@ static struct pci_device_id agp_ali_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_ali_pci_table);
 
 static struct pci_driver agp_ali_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-ali",
         .id_table       = agp_ali_pci_table,
         .probe          = agp_ali_probe,
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index 40fcd88b2cea..1f776651ac64 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -515,7 +515,6 @@ static struct pci_device_id agp_amdk7_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_amdk7_pci_table);
 
 static struct pci_driver agp_amdk7_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-amdk7",
         .id_table       = agp_amdk7_pci_table,
         .probe          = agp_amdk7_probe,
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 8f748fddca94..78ce98a69f37 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -703,7 +703,6 @@ static struct pci_device_id agp_amd64_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_amd64_pci_table);
 
 static struct pci_driver agp_amd64_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-amd64",
         .id_table       = agp_amd64_pci_table,
         .probe          = agp_amd64_probe,
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index fbd415565463..53372a83b675 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -521,7 +521,6 @@ static struct pci_device_id agp_ati_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_ati_pci_table);
 
 static struct pci_driver agp_ati_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-ati",
         .id_table       = agp_ati_pci_table,
         .probe          = agp_ati_probe,
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index d41e0a62e32e..e7aea77a60f9 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -429,7 +429,6 @@ static struct pci_device_id agp_efficeon_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_efficeon_pci_table);
 
 static struct pci_driver agp_efficeon_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-efficeon",
         .id_table       = agp_efficeon_pci_table,
         .probe          = agp_efficeon_probe,
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
index 34a444658ffe..8ee19a4a6bce 100644
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
@@ -622,7 +622,6 @@ static struct pci_device_id agp_intel_i460_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_intel_i460_pci_table);
 
 static struct pci_driver agp_intel_i460_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-intel-i460",
         .id_table       = agp_intel_i460_pci_table,
         .probe          = agp_intel_i460_probe,
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 027161ab88e9..e7bed5047dcc 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1827,7 +1827,6 @@ static struct pci_device_id agp_intel_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
 
 static struct pci_driver agp_intel_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-intel",
         .id_table       = agp_intel_pci_table,
         .probe          = agp_intel_probe,
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index 3aed0c5e2f92..80dafa3030bd 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -398,7 +398,6 @@ static struct pci_device_id agp_nvidia_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_nvidia_pci_table);
 
 static struct pci_driver agp_nvidia_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-nvidia",
         .id_table       = agp_nvidia_pci_table,
         .probe          = agp_nvidia_probe,
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index a701361a8890..ebc05554045c 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -332,7 +332,6 @@ static struct pci_device_id agp_sis_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_sis_pci_table);
 
 static struct pci_driver agp_sis_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-sis",
         .id_table       = agp_sis_pci_table,
         .probe          = agp_sis_probe,
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 5a5392dd1254..3f8f7fa6b0ff 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -545,7 +545,6 @@ static struct pci_device_id agp_serverworks_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_serverworks_pci_table);
 
 static struct pci_driver agp_serverworks_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-serverworks",
         .id_table       = agp_serverworks_pci_table,
         .probe          = agp_serverworks_probe,
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 183c50acab27..c8255312b8c1 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -658,7 +658,6 @@ static struct pci_device_id agp_uninorth_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_uninorth_pci_table);
 
 static struct pci_driver agp_uninorth_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-uninorth",
         .id_table       = agp_uninorth_pci_table,
         .probe          = agp_uninorth_probe,
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 5d9a13700074..c847df575cf5 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -518,7 +518,6 @@ MODULE_DEVICE_TABLE(pci, agp_via_pci_table);
 
 
 static struct pci_driver agp_via_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "agpgart-via",
         .id_table       = agp_via_pci_table,
         .probe          = agp_via_probe,
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index b7a0e4d6b934..407708a001e4 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -3113,7 +3113,6 @@ MODULE_DEVICE_TABLE(pci, epca_pci_tbl);
 int __init init_PCI (void)
 {       /* Begin init_PCI */
         memset (&epca_driver, 0, sizeof (epca_driver));
-        epca_driver.owner = THIS_MODULE;
         epca_driver.name = "epca";
         epca_driver.id_table = epca_pci_tbl;
         epca_driver.probe = epca_init_one;
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index c1d06ba449b6..d16bd4b5c117 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -2648,7 +2648,7 @@ void ipmi_smi_msg_received(ipmi_smi_t          intf,
         spin_lock_irqsave(&intf->waiting_msgs_lock, flags);
         if (!list_empty(&intf->waiting_msgs)) {
                 list_add_tail(&msg->link, &intf->waiting_msgs);
-                spin_unlock(&intf->waiting_msgs_lock);
+                spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
                 goto out;
         }
         spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
@@ -2657,9 +2657,9 @@ void ipmi_smi_msg_received(ipmi_smi_t          intf,
         if (rv > 0) {
                 /* Could not handle the message now, just add it to a
                    list to handle later. */
-                spin_lock(&intf->waiting_msgs_lock);
+                spin_lock_irqsave(&intf->waiting_msgs_lock, flags);
                 list_add_tail(&msg->link, &intf->waiting_msgs);
-                spin_unlock(&intf->waiting_msgs_lock);
+                spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
         } else if (rv == 0) {
                 ipmi_free_smi_msg(msg);
         }
diff --git a/drivers/char/s3c2410-rtc.c b/drivers/char/s3c2410-rtc.c
index d724c0de4f28..3df7a574267b 100644
--- a/drivers/char/s3c2410-rtc.c
+++ b/drivers/char/s3c2410-rtc.c
@@ -382,7 +382,7 @@ static struct rtc_ops s3c2410_rtcops = {
         .proc           = s3c2410_rtc_proc,
 };
 
-static void s3c2410_rtc_enable(struct device *dev, int en)
+static void s3c2410_rtc_enable(struct platform_device *pdev, int en)
 {
         unsigned int tmp;
 
@@ -399,21 +399,21 @@ static void s3c2410_rtc_enable(struct device *dev, int en)
                 /* re-enable the device, and check it is ok */
 
                 if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_RTCEN) == 0){
-                        dev_info(dev, "rtc disabled, re-enabling\n");
+                        dev_info(&pdev->dev, "rtc disabled, re-enabling\n");
 
                         tmp = readb(S3C2410_RTCCON);
                         writeb(tmp | S3C2410_RTCCON_RTCEN , S3C2410_RTCCON);
                 }
 
                 if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_CNTSEL)){
-                        dev_info(dev, "removing S3C2410_RTCCON_CNTSEL\n");
+                        dev_info(&pdev->dev, "removing S3C2410_RTCCON_CNTSEL\n");
 
                         tmp = readb(S3C2410_RTCCON);
                         writeb(tmp& ~S3C2410_RTCCON_CNTSEL , S3C2410_RTCCON);
                 }
 
                 if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_CLKRST)){
-                        dev_info(dev, "removing S3C2410_RTCCON_CLKRST\n");
+                        dev_info(&pdev->dev, "removing S3C2410_RTCCON_CLKRST\n");
 
                         tmp = readb(S3C2410_RTCCON);
                         writeb(tmp & ~S3C2410_RTCCON_CLKRST, S3C2410_RTCCON);
@@ -421,7 +421,7 @@ static void s3c2410_rtc_enable(struct device *dev, int en)
         }
 }
 
-static int s3c2410_rtc_remove(struct device *dev)
+static int s3c2410_rtc_remove(struct platform_device *dev)
 {
         unregister_rtc(&s3c2410_rtcops);
 
@@ -438,25 +438,24 @@ static int s3c2410_rtc_remove(struct device *dev)
         return 0;
 }
 
-static int s3c2410_rtc_probe(struct device *dev)
+static int s3c2410_rtc_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct resource *res;
         int ret;
 
-        pr_debug("%s: probe=%p, device=%p\n", __FUNCTION__, pdev, dev);
+        pr_debug("%s: probe=%p\n", __FUNCTION__, pdev);
 
         /* find the IRQs */
 
         s3c2410_rtc_tickno = platform_get_irq(pdev, 1);
         if (s3c2410_rtc_tickno <= 0) {
-                dev_err(dev, "no irq for rtc tick\n");
+                dev_err(&pdev->dev, "no irq for rtc tick\n");
                 return -ENOENT;
         }
 
         s3c2410_rtc_alarmno = platform_get_irq(pdev, 0);
         if (s3c2410_rtc_alarmno <= 0) {
-                dev_err(dev, "no irq for alarm\n");
+                dev_err(&pdev->dev, "no irq for alarm\n");
                 return -ENOENT;
         }
 
@@ -467,7 +466,7 @@ static int s3c2410_rtc_probe(struct device *dev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
-                dev_err(dev, "failed to get memory region resource\n");
+                dev_err(&pdev->dev, "failed to get memory region resource\n");
                 return -ENOENT;
         }
 
@@ -475,14 +474,14 @@ static int s3c2410_rtc_probe(struct device *dev)
                                      pdev->name);
 
         if (s3c2410_rtc_mem == NULL) {
-                dev_err(dev, "failed to reserve memory region\n");
+                dev_err(&pdev->dev, "failed to reserve memory region\n");
                 ret = -ENOENT;
                 goto exit_err;
         }
 
         s3c2410_rtc_base = ioremap(res->start, res->end - res->start + 1);
         if (s3c2410_rtc_base == NULL) {
-                dev_err(dev, "failed ioremap()\n");
+                dev_err(&pdev->dev, "failed ioremap()\n");
                 ret = -EINVAL;
                 goto exit_err;
         }
@@ -494,7 +493,7 @@ static int s3c2410_rtc_probe(struct device *dev)
 
         /* check to see if everything is setup correctly */
 
-        s3c2410_rtc_enable(dev, 1);
+        s3c2410_rtc_enable(pdev, 1);
 
         pr_debug("s3c2410_rtc: RTCCON=%02x\n", readb(S3C2410_RTCCON));
 
@@ -506,7 +505,7 @@ static int s3c2410_rtc_probe(struct device *dev)
         return 0;
 
  exit_err:
-        dev_err(dev, "error %d during initialisation\n", ret);
+        dev_err(&pdev->dev, "error %d during initialisation\n", ret);
 
         return ret;
 }
@@ -519,7 +518,7 @@ static struct timespec s3c2410_rtc_delta;
 
 static int ticnt_save;
 
-static int s3c2410_rtc_suspend(struct device *dev, pm_message_t state)
+static int s3c2410_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct rtc_time tm;
         struct timespec time;
@@ -535,19 +534,19 @@ static int s3c2410_rtc_suspend(struct device *dev, pm_message_t state)
         s3c2410_rtc_gettime(&tm);
         rtc_tm_to_time(&tm, &time.tv_sec);
         save_time_delta(&s3c2410_rtc_delta, &time);
-        s3c2410_rtc_enable(dev, 0);
+        s3c2410_rtc_enable(pdev, 0);
 
         return 0;
 }
 
-static int s3c2410_rtc_resume(struct device *dev)
+static int s3c2410_rtc_resume(struct platform_device *pdev)
 {
         struct rtc_time tm;
         struct timespec time;
 
         time.tv_nsec = 0;
 
-        s3c2410_rtc_enable(dev, 1);
+        s3c2410_rtc_enable(pdev, 1);
         s3c2410_rtc_gettime(&tm);
         rtc_tm_to_time(&tm, &time.tv_sec);
         restore_time_delta(&s3c2410_rtc_delta, &time);
@@ -560,14 +559,15 @@ static int s3c2410_rtc_resume(struct device *dev)
 #define s3c2410_rtc_resume  NULL
 #endif
 
-static struct device_driver s3c2410_rtcdrv = {
-        .name           = "s3c2410-rtc",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410_rtcdrv = {
         .probe          = s3c2410_rtc_probe,
         .remove         = s3c2410_rtc_remove,
         .suspend        = s3c2410_rtc_suspend,
         .resume         = s3c2410_rtc_resume,
+        .driver         = {
+                .name   = "s3c2410-rtc",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static char __initdata banner[] = "S3C2410 RTC, (c) 2004 Simtec Electronics\n";
@@ -575,12 +575,12 @@ static char __initdata banner[] = "S3C2410 RTC, (c) 2004 Simtec Electronics\n";
 static int __init s3c2410_rtc_init(void)
 {
         printk(banner);
-        return driver_register(&s3c2410_rtcdrv);
+        return platform_driver_register(&s3c2410_rtcdrv);
 }
 
 static void __exit s3c2410_rtc_exit(void)
 {
-        driver_unregister(&s3c2410_rtcdrv);
+        platform_driver_unregister(&s3c2410_rtcdrv);
 }
 
 module_init(s3c2410_rtc_init);
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index d05067dcea01..51a07370e636 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1168,7 +1168,7 @@ static int sonypi_disable(void)
 #ifdef CONFIG_PM
 static int old_camera_power;
 
-static int sonypi_suspend(struct device *dev, pm_message_t state)
+static int sonypi_suspend(struct platform_device *dev, pm_message_t state)
 {
         old_camera_power = sonypi_device.camera_power;
         sonypi_disable();
@@ -1176,26 +1176,27 @@ static int sonypi_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int sonypi_resume(struct device *dev)
+static int sonypi_resume(struct platform_device *dev)
 {
         sonypi_enable(old_camera_power);
         return 0;
 }
 #endif
 
-static void sonypi_shutdown(struct device *dev)
+static void sonypi_shutdown(struct platform_device *dev)
 {
         sonypi_disable();
 }
 
-static struct device_driver sonypi_driver = {
-        .name           = "sonypi",
-        .bus            = &platform_bus_type,
+static struct platform_driver sonypi_driver = {
 #ifdef CONFIG_PM
         .suspend        = sonypi_suspend,
         .resume         = sonypi_resume,
 #endif
         .shutdown       = sonypi_shutdown,
+        .driver         = {
+                .name   = "sonypi",
+        },
 };
 
 static int __devinit sonypi_create_input_devices(void)
@@ -1455,20 +1456,20 @@ static int __init sonypi_init(void)
         if (!dmi_check_system(sonypi_dmi_table))
                 return -ENODEV;
 
-        ret = driver_register(&sonypi_driver);
+        ret = platform_driver_register(&sonypi_driver);
         if (ret)
                 return ret;
 
         ret = sonypi_probe();
         if (ret)
-                driver_unregister(&sonypi_driver);
+                platform_driver_unregister(&sonypi_driver);
 
         return ret;
 }
 
 static void __exit sonypi_exit(void)
 {
-        driver_unregister(&sonypi_driver);
+        platform_driver_unregister(&sonypi_driver);
         sonypi_remove();
 }
 
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 5d1ffa3bd4c3..82c6abde68df 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -912,7 +912,6 @@ MODULE_DEVICE_TABLE(pci, synclink_pci_tbl);
 MODULE_LICENSE("GPL");
 
 static struct pci_driver synclink_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "synclink",
         .id_table       = synclink_pci_tbl,
         .probe          = synclink_init_one,
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 7c063c5abc55..ee5a40be9f99 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -500,7 +500,6 @@ MODULE_DEVICE_TABLE(pci, synclinkmp_pci_tbl);
 MODULE_LICENSE("GPL");
 
 static struct pci_driver synclinkmp_pci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "synclinkmp",
         .id_table       = synclinkmp_pci_tbl,
         .probe          = synclinkmp_init_one,
diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c
index 24355b23b2ca..b3d411a756fe 100644
--- a/drivers/char/tb0219.c
+++ b/drivers/char/tb0219.c
@@ -283,7 +283,7 @@ static void tb0219_pci_irq_init(void)
         vr41xx_set_irq_level(TB0219_PCI_SLOT3_PIN, IRQ_LEVEL_LOW);
 }
 
-static int tb0219_probe(struct device *dev)
+static int tb0219_probe(struct platform_device *dev)
 {
         int retval;
 
@@ -319,7 +319,7 @@ static int tb0219_probe(struct device *dev)
         return 0;
 }
 
-static int tb0219_remove(struct device *dev)
+static int tb0219_remove(struct platform_device *dev)
 {
         _machine_restart = old_machine_restart;
 
@@ -333,11 +333,12 @@ static int tb0219_remove(struct device *dev)
 
 static struct platform_device *tb0219_platform_device;
 
-static struct device_driver tb0219_device_driver = {
-        .name           = "TB0219",
-        .bus            = &platform_bus_type,
+static struct platform_driver tb0219_device_driver = {
         .probe          = tb0219_probe,
         .remove         = tb0219_remove,
+        .driver         = {
+                .name   = "TB0219",
+        },
 };
 
 static int __devinit tanbac_tb0219_init(void)
@@ -348,7 +349,7 @@ static int __devinit tanbac_tb0219_init(void)
         if (IS_ERR(tb0219_platform_device))
                 return PTR_ERR(tb0219_platform_device);
 
-        retval = driver_register(&tb0219_device_driver);
+        retval = platform_driver_register(&tb0219_device_driver);
         if (retval < 0)
                 platform_device_unregister(tb0219_platform_device);
 
@@ -357,7 +358,7 @@ static int __devinit tanbac_tb0219_init(void)
 
 static void __devexit tanbac_tb0219_exit(void)
 {
-        driver_unregister(&tb0219_device_driver);
+        platform_driver_unregister(&tb0219_device_driver);
 
         platform_device_unregister(tb0219_platform_device);
 }
diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
index 94641085faf8..9ac6d43437b3 100644
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
@@ -613,7 +613,7 @@ static struct file_operations gpio_fops = {
         .release        = gpio_release,
 };
 
-static int giu_probe(struct device *dev)
+static int giu_probe(struct platform_device *dev)
 {
         unsigned long start, size, flags = 0;
         unsigned int nr_pins = 0;
@@ -697,7 +697,7 @@ static int giu_probe(struct device *dev)
         return cascade_irq(GIUINT_IRQ, giu_get_irq);
 }
 
-static int giu_remove(struct device *dev)
+static int giu_remove(struct platform_device *dev)
 {
         iounmap(giu_base);
 
@@ -710,11 +710,12 @@ static int giu_remove(struct device *dev)
 
 static struct platform_device *giu_platform_device;
 
-static struct device_driver giu_device_driver = {
-        .name           = "GIU",
-        .bus            = &platform_bus_type,
+static struct platform_driver giu_device_driver = {
         .probe          = giu_probe,
         .remove         = giu_remove,
+        .driver         = {
+                .name   = "GIU",
+        },
 };
 
 static int __devinit vr41xx_giu_init(void)
@@ -725,7 +726,7 @@ static int __devinit vr41xx_giu_init(void)
         if (IS_ERR(giu_platform_device))
                 return PTR_ERR(giu_platform_device);
 
-        retval = driver_register(&giu_device_driver);
+        retval = platform_driver_register(&giu_device_driver);
         if (retval < 0)
                 platform_device_unregister(giu_platform_device);
 
@@ -734,7 +735,7 @@ static int __devinit vr41xx_giu_init(void)
 
 static void __devexit vr41xx_giu_exit(void)
 {
-        driver_unregister(&giu_device_driver);
+        platform_driver_unregister(&giu_device_driver);
 
         platform_device_unregister(giu_platform_device);
 }
diff --git a/drivers/char/vr41xx_rtc.c b/drivers/char/vr41xx_rtc.c
index 5e3292df69d8..435b30748e23 100644
--- a/drivers/char/vr41xx_rtc.c
+++ b/drivers/char/vr41xx_rtc.c
@@ -560,13 +560,11 @@ static struct miscdevice rtc_miscdevice = {
         .fops   = &rtc_fops,
 };
 
-static int rtc_probe(struct device *dev)
+static int rtc_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev;
         unsigned int irq;
         int retval;
 
-        pdev = to_platform_device(dev);
         if (pdev->num_resources != 2)
                 return -EBUSY;
 
@@ -635,7 +633,7 @@ static int rtc_probe(struct device *dev)
         return 0;
 }
 
-static int rtc_remove(struct device *dev)
+static int rtc_remove(struct platform_device *dev)
 {
         int retval;
 
@@ -655,11 +653,12 @@ static int rtc_remove(struct device *dev)
 
 static struct platform_device *rtc_platform_device;
 
-static struct device_driver rtc_device_driver = {
-        .name           = rtc_name,
-        .bus            = &platform_bus_type,
+static struct platform_driver rtc_device_driver = {
         .probe          = rtc_probe,
         .remove         = rtc_remove,
+        .driver         = {
+                .name   = rtc_name,
+        },
 };
 
 static int __devinit vr41xx_rtc_init(void)
@@ -691,7 +690,7 @@ static int __devinit vr41xx_rtc_init(void)
         if (IS_ERR(rtc_platform_device))
                 return PTR_ERR(rtc_platform_device);
 
-        retval = driver_register(&rtc_device_driver);
+        retval = platform_driver_register(&rtc_device_driver);
         if (retval < 0)
                 platform_device_unregister(rtc_platform_device);
 
@@ -700,7 +699,7 @@ static int __devinit vr41xx_rtc_init(void)
 
 static void __devexit vr41xx_rtc_exit(void)
 {
-        driver_unregister(&rtc_device_driver);
+        platform_driver_unregister(&rtc_device_driver);
 
         platform_device_unregister(rtc_platform_device);
 }
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index da631c114fd1..9defcf861b67 100644
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -139,7 +139,7 @@ static int mpcore_wdt_set_heartbeat(int t)
  */
 static int mpcore_wdt_open(struct inode *inode, struct file *file)
 {
-        struct mpcore_wdt *wdt = dev_get_drvdata(&mpcore_wdt_dev->dev);
+        struct mpcore_wdt *wdt = platform_get_drvdata(mpcore_wdt_dev);
 
         if (test_and_set_bit(0, &wdt->timer_alive))
                 return -EBUSY;
@@ -291,9 +291,9 @@ static int mpcore_wdt_ioctl(struct inode *inode, struct file *file,
  *      System shutdown handler.  Turn off the watchdog if we're
  *      restarting or halting the system.
  */
-static void mpcore_wdt_shutdown(struct device *_dev)
+static void mpcore_wdt_shutdown(struct platform_device *dev)
 {
-        struct mpcore_wdt *wdt = dev_get_drvdata(_dev);
+        struct mpcore_wdt *wdt = platform_get_drvdata(dev);
 
         if (system_state == SYSTEM_RESTART || system_state == SYSTEM_HALT)
                 mpcore_wdt_stop(wdt);
@@ -317,9 +317,8 @@ static struct miscdevice mpcore_wdt_miscdev = {
         .fops           = &mpcore_wdt_fops,
 };
 
-static int __devinit mpcore_wdt_probe(struct device *_dev)
+static int __devinit mpcore_wdt_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct mpcore_wdt *wdt;
         struct resource *res;
         int ret;
@@ -364,7 +363,7 @@ static int __devinit mpcore_wdt_probe(struct device *_dev)
         }
 
         mpcore_wdt_stop(wdt);
-        dev_set_drvdata(&dev->dev, wdt);
+        platform_set_drvdata(&dev->dev, wdt);
         mpcore_wdt_dev = dev;
 
         return 0;
@@ -379,11 +378,11 @@ static int __devinit mpcore_wdt_probe(struct device *_dev)
         return ret;
 }
 
-static int __devexit mpcore_wdt_remove(struct device *dev)
+static int __devexit mpcore_wdt_remove(struct platform_device *dev)
 {
-        struct mpcore_wdt *wdt = dev_get_drvdata(dev);
+        struct mpcore_wdt *wdt = platform_get_drvdata(dev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         misc_deregister(&mpcore_wdt_miscdev);
 
@@ -395,13 +394,14 @@ static int __devexit mpcore_wdt_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver mpcore_wdt_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "mpcore_wdt",
-        .bus            = &platform_bus_type,
+static struct platform_driver mpcore_wdt_driver = {
         .probe          = mpcore_wdt_probe,
         .remove         = __devexit_p(mpcore_wdt_remove),
         .shutdown       = mpcore_wdt_shutdown,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "mpcore_wdt",
+        },
 };
 
 static char banner[] __initdata = KERN_INFO "MPcore Watchdog Timer: 0.1. mpcore_noboot=%d mpcore_margin=%d sec (nowayout= %d)\n";
@@ -420,12 +420,12 @@ static int __init mpcore_wdt_init(void)
 
         printk(banner, mpcore_noboot, mpcore_margin, nowayout);
 
-        return driver_register(&mpcore_wdt_driver);
+        return platform_driver_register(&mpcore_wdt_driver);
 }
 
 static void __exit mpcore_wdt_exit(void)
 {
-        driver_unregister(&mpcore_wdt_driver);
+        platform_driver_unregister(&mpcore_wdt_driver);
 }
 
 module_init(mpcore_wdt_init);
diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c
index 119b3c541d95..00d9ef04a369 100644
--- a/drivers/char/watchdog/mv64x60_wdt.c
+++ b/drivers/char/watchdog/mv64x60_wdt.c
@@ -182,10 +182,9 @@ static struct miscdevice mv64x60_wdt_miscdev = {
         .fops = &mv64x60_wdt_fops,
 };
 
-static int __devinit mv64x60_wdt_probe(struct device *dev)
+static int __devinit mv64x60_wdt_probe(struct platform_device *dev)
 {
-        struct platform_device *pd = to_platform_device(dev);
-        struct mv64x60_wdt_pdata *pdata = pd->dev.platform_data;
+        struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data;
         int bus_clk = 133;
 
         mv64x60_wdt_timeout = 10;
@@ -202,7 +201,7 @@ static int __devinit mv64x60_wdt_probe(struct device *dev)
         return misc_register(&mv64x60_wdt_miscdev);
 }
 
-static int __devexit mv64x60_wdt_remove(struct device *dev)
+static int __devexit mv64x60_wdt_remove(struct platform_device *dev)
 {
         misc_deregister(&mv64x60_wdt_miscdev);
 
@@ -212,12 +211,13 @@ static int __devexit mv64x60_wdt_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver mv64x60_wdt_driver = {
-        .owner = THIS_MODULE,
-        .name = MV64x60_WDT_NAME,
-        .bus = &platform_bus_type,
+static struct platform_driver mv64x60_wdt_driver = {
         .probe = mv64x60_wdt_probe,
         .remove = __devexit_p(mv64x60_wdt_remove),
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = MV64x60_WDT_NAME,
+        },
 };
 
 static struct platform_device *mv64x60_wdt_dev;
@@ -235,14 +235,14 @@ static int __init mv64x60_wdt_init(void)
                 goto out;
         }
 
-        ret = driver_register(&mv64x60_wdt_driver);
+        ret = platform_driver_register(&mv64x60_wdt_driver);
       out:
         return ret;
 }
 
 static void __exit mv64x60_wdt_exit(void)
 {
-        driver_unregister(&mv64x60_wdt_driver);
+        platform_driver_unregister(&mv64x60_wdt_driver);
         platform_device_unregister(mv64x60_wdt_dev);
 }
 
diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/char/watchdog/pcwd_pci.c
index d9ef55bdf88a..2451edbefece 100644
--- a/drivers/char/watchdog/pcwd_pci.c
+++ b/drivers/char/watchdog/pcwd_pci.c
@@ -755,7 +755,6 @@ static struct pci_device_id pcipcwd_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, pcipcwd_pci_tbl);
 
 static struct pci_driver pcipcwd_driver = {
-        .owner          = THIS_MODULE,
         .name           = WATCHDOG_NAME,
         .id_table       = pcipcwd_pci_tbl,
         .probe          = pcipcwd_card_init,
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index 751cb77b0715..eb667daee19b 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -347,15 +347,14 @@ static irqreturn_t s3c2410wdt_irq(int irqno, void *param,
 }
 /* device interface */
 
-static int s3c2410wdt_probe(struct device *dev)
+static int s3c2410wdt_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct resource *res;
         int started = 0;
         int ret;
         int size;
 
-        DBG("%s: probe=%p, device=%p\n", __FUNCTION__, pdev, dev);
+        DBG("%s: probe=%p\n", __FUNCTION__, pdev);
 
         /* get the memory region for the watchdog timer */
 
@@ -386,13 +385,13 @@ static int s3c2410wdt_probe(struct device *dev)
                 return -ENOENT;
         }
 
-        ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, dev);
+        ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, pdev);
         if (ret != 0) {
                 printk(KERN_INFO PFX "failed to install irq (%d)\n", ret);
                 return ret;
         }
 
-        wdt_clock = clk_get(dev, "watchdog");
+        wdt_clock = clk_get(&pdev->dev, "watchdog");
         if (wdt_clock == NULL) {
                 printk(KERN_INFO PFX "failed to find watchdog clock source\n");
                 return -ENOENT;
@@ -430,7 +429,7 @@ static int s3c2410wdt_probe(struct device *dev)
         return 0;
 }
 
-static int s3c2410wdt_remove(struct device *dev)
+static int s3c2410wdt_remove(struct platform_device *dev)
 {
         if (wdt_mem != NULL) {
                 release_resource(wdt_mem);
@@ -454,7 +453,7 @@ static int s3c2410wdt_remove(struct device *dev)
         return 0;
 }
 
-static void s3c2410wdt_shutdown(struct device *dev)
+static void s3c2410wdt_shutdown(struct platform_device *dev)
 {
         s3c2410wdt_stop();      
 }
@@ -464,7 +463,7 @@ static void s3c2410wdt_shutdown(struct device *dev)
 static unsigned long wtcon_save;
 static unsigned long wtdat_save;
 
-static int s3c2410wdt_suspend(struct device *dev, pm_message_t state)
+static int s3c2410wdt_suspend(struct platform_device *dev, pm_message_t state)
 {
         /* Save watchdog state, and turn it off. */
         wtcon_save = readl(wdt_base + S3C2410_WTCON);
@@ -476,7 +475,7 @@ static int s3c2410wdt_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int s3c2410wdt_resume(struct device *dev)
+static int s3c2410wdt_resume(struct platform_device *dev)
 {
         /* Restore watchdog state. */
 
@@ -496,15 +495,16 @@ static int s3c2410wdt_resume(struct device *dev)
 #endif /* CONFIG_PM */
 
 
-static struct device_driver s3c2410wdt_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "s3c2410-wdt",
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410wdt_driver = {
         .probe          = s3c2410wdt_probe,
         .remove         = s3c2410wdt_remove,
         .shutdown       = s3c2410wdt_shutdown,
         .suspend        = s3c2410wdt_suspend,
         .resume         = s3c2410wdt_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "s3c2410-wdt",
+        },
 };
 
 
@@ -513,12 +513,12 @@ static char banner[] __initdata = KERN_INFO "S3C2410 Watchdog Timer, (c) 2004 Si
 static int __init watchdog_init(void)
 {
         printk(banner);
-        return driver_register(&s3c2410wdt_driver);
+        return platform_driver_register(&s3c2410wdt_driver);
 }
 
 static void __exit watchdog_exit(void)
 {
-        driver_unregister(&s3c2410wdt_driver);
+        platform_driver_unregister(&s3c2410wdt_driver);
 }
 
 module_init(watchdog_init);
diff --git a/drivers/char/watchdog/wdt_pci.c b/drivers/char/watchdog/wdt_pci.c
index dc9370f6c348..4b3311993d48 100644
--- a/drivers/char/watchdog/wdt_pci.c
+++ b/drivers/char/watchdog/wdt_pci.c
@@ -711,7 +711,6 @@ MODULE_DEVICE_TABLE(pci, wdtpci_pci_tbl);
 
 
 static struct pci_driver wdtpci_driver = {
-        .owner          = THIS_MODULE,
         .name           = "wdt_pci",
         .id_table       = wdtpci_pci_tbl,
         .probe          = wdtpci_init_one,
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 1e5dfc7805e2..c81bd4bce1b8 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -60,9 +60,11 @@
 
 #define HDAPS_POLL_PERIOD       (HZ/20) /* poll for input every 1/20s */
 #define HDAPS_INPUT_FUZZ        4       /* input event threshold */
+#define HDAPS_INPUT_FLAT        4
 
 static struct timer_list hdaps_timer;
 static struct platform_device *pdev;
+static struct input_dev *hdaps_idev;
 static unsigned int hdaps_invert;
 static u8 km_activity;
 static int rest_x;
@@ -284,7 +286,7 @@ out:
 
 /* Device model stuff */
 
-static int hdaps_probe(struct device *dev)
+static int hdaps_probe(struct platform_device *dev)
 {
         int ret;
 
@@ -296,29 +298,18 @@ static int hdaps_probe(struct device *dev)
         return 0;
 }
 
-static int hdaps_resume(struct device *dev)
+static int hdaps_resume(struct platform_device *dev)
 {
         return hdaps_device_init();
 }
 
-static struct device_driver hdaps_driver = {
-        .name = "hdaps",
-        .bus = &platform_bus_type,
-        .owner = THIS_MODULE,
+static struct platform_driver hdaps_driver = {
         .probe = hdaps_probe,
-        .resume = hdaps_resume
-};
-
-/* Input class stuff */
-
-static struct input_dev hdaps_idev = {
-        .name = "hdaps",
-        .evbit = { BIT(EV_ABS) },
-        .absbit = { BIT(ABS_X) | BIT(ABS_Y) },
-        .absmin  = { [ABS_X] = -256, [ABS_Y] = -256 },
-        .absmax  = { [ABS_X] = 256, [ABS_Y] = 256 },
-        .absfuzz = { [ABS_X] = HDAPS_INPUT_FUZZ, [ABS_Y] = HDAPS_INPUT_FUZZ },
-        .absflat = { [ABS_X] = HDAPS_INPUT_FUZZ, [ABS_Y] = HDAPS_INPUT_FUZZ },
+        .resume = hdaps_resume,
+        .driver = {
+                .name = "hdaps",
+                .owner = THIS_MODULE,
+        },
 };
 
 /*
@@ -342,9 +333,9 @@ static void hdaps_mousedev_poll(unsigned long unused)
         if (__hdaps_read_pair(HDAPS_PORT_XPOS, HDAPS_PORT_YPOS, &x, &y))
                 goto out;
 
-        input_report_abs(&hdaps_idev, ABS_X, x - rest_x);
-        input_report_abs(&hdaps_idev, ABS_Y, y - rest_y);
-        input_sync(&hdaps_idev);
+        input_report_abs(hdaps_idev, ABS_X, x - rest_x);
+        input_report_abs(hdaps_idev, ABS_Y, y - rest_y);
+        input_sync(hdaps_idev);
 
         mod_timer(&hdaps_timer, jiffies + HDAPS_POLL_PERIOD);
 
@@ -550,7 +541,7 @@ static int __init hdaps_init(void)
                 goto out;
         }
 
-        ret = driver_register(&hdaps_driver);
+        ret = platform_driver_register(&hdaps_driver);
         if (ret)
                 goto out_region;
 
@@ -564,12 +555,25 @@ static int __init hdaps_init(void)
         if (ret)
                 goto out_device;
 
+        hdaps_idev = input_allocate_device();
+        if (!hdaps_idev) {
+                ret = -ENOMEM;
+                goto out_group;
+        }
+
         /* initial calibrate for the input device */
         hdaps_calibrate();
 
         /* initialize the input class */
-        hdaps_idev.dev = &pdev->dev;
-        input_register_device(&hdaps_idev);
+        hdaps_idev->name = "hdaps";
+        hdaps_idev->cdev.dev = &pdev->dev;
+        hdaps_idev->evbit[0] = BIT(EV_ABS);
+        input_set_abs_params(hdaps_idev, ABS_X,
+                        -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
+        input_set_abs_params(hdaps_idev, ABS_X,
+                        -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
+
+        input_register_device(hdaps_idev);
 
         /* start up our timer for the input device */
         init_timer(&hdaps_timer);
@@ -580,10 +584,12 @@ static int __init hdaps_init(void)
         printk(KERN_INFO "hdaps: driver successfully loaded.\n");
         return 0;
 
+out_group:
+        sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group);
 out_device:
         platform_device_unregister(pdev);
 out_driver:
-        driver_unregister(&hdaps_driver);
+        platform_driver_unregister(&hdaps_driver);
 out_region:
         release_region(HDAPS_LOW_PORT, HDAPS_NR_PORTS);
 out:
@@ -594,10 +600,10 @@ out:
 static void __exit hdaps_exit(void)
 {
         del_timer_sync(&hdaps_timer);
-        input_unregister_device(&hdaps_idev);
+        input_unregister_device(hdaps_idev);
         sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group);
         platform_device_unregister(pdev);
-        driver_unregister(&hdaps_driver);
+        platform_driver_unregister(&hdaps_driver);
         release_region(HDAPS_LOW_PORT, HDAPS_NR_PORTS);
 
         printk(KERN_INFO "hdaps: driver unloaded.\n");
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..cef024a7d048 100644
--- a/drivers/i2c/busses/i2c-ixp2000.c
+++ b/drivers/i2c/busses/i2c-ixp2000.c
@@ -86,12 +86,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 +99,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);
@@ -139,27 +137,28 @@ static int ixp2000_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 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..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);
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..afd7634e5cc9 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,7 +525,7 @@ 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,
@@ -555,9 +554,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 +567,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,
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 9dbb72fffbe2..d2a100d77839 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -873,26 +873,27 @@ static int otg_init(struct isp1301 *isp)
         return 0;
 }
 
-static int otg_probe(struct device *dev)
+static int otg_probe(struct platform_device *dev)
 {
         // struct omap_usb_config *config = dev->platform_data;
 
-        otg_dev = to_platform_device(dev);
+        otg_dev = dev;
         return 0;
 }
 
-static int otg_remove(struct device *dev)
+static int otg_remove(struct platform_device *dev)
 {
         otg_dev = 0;
         return 0;
 }
 
-struct device_driver omap_otg_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "omap_otg",
-        .bus            = &platform_bus_type,
+struct platform_driver omap_otg_driver = {
         .probe          = otg_probe,
-        .remove         = otg_remove,   
+        .remove         = otg_remove,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "omap_otg",
+        },
 };
 
 static int otg_bind(struct isp1301 *isp)
@@ -902,7 +903,7 @@ static int otg_bind(struct isp1301 *isp)
         if (otg_dev)
                 return -EBUSY;
 
-        status = driver_register(&omap_otg_driver);
+        status = platform_driver_register(&omap_otg_driver);
         if (status < 0)
                 return status;
 
@@ -913,7 +914,7 @@ static int otg_bind(struct isp1301 *isp)
                 status = -ENODEV;
 
         if (status < 0)
-                driver_unregister(&omap_otg_driver);
+                platform_driver_unregister(&omap_otg_driver);
         return status;
 }
 
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 18ed7765417c..d4f2111d4364 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -787,8 +787,9 @@ static int pre_init = 1;		/* Before first ordered IDE scan */
 static LIST_HEAD(ide_pci_drivers);
 
 /*
- *      ide_register_pci_driver         -       attach IDE driver
+ *      __ide_register_pci_driver       -       attach IDE driver
  *      @driver: pci driver
+ *      @module: owner module of the driver
  *
  *      Registers a driver with the IDE layer. The IDE layer arranges that
  *      boot time setup is done in the expected device order and then 
@@ -801,15 +802,16 @@ static LIST_HEAD(ide_pci_drivers);
  *      Returns are the same as for pci_register_driver
  */
 
-int ide_pci_register_driver(struct pci_driver *driver)
+int __ide_pci_register_driver(struct pci_driver *driver, struct module *module)
 {
         if(!pre_init)
-                return pci_module_init(driver);
+                return __pci_register_driver(driver, module);
+        driver->driver.owner = module;
         list_add_tail(&driver->node, &ide_pci_drivers);
         return 0;
 }
 
-EXPORT_SYMBOL_GPL(ide_pci_register_driver);
+EXPORT_SYMBOL_GPL(__ide_pci_register_driver);
 
 /**
  *      ide_unregister_pci_driver       -       unregister an IDE driver
@@ -897,6 +899,6 @@ void __init ide_scan_pcibus (int scan_direction)
         {
                 list_del(l);
                 d = list_entry(l, struct pci_driver, node);
-                pci_register_driver(d);
+                __pci_register_driver(d, d->driver.owner);
         }
 }
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index aed5ca23fb22..5ea741f47fc8 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -31,7 +31,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * $Id: user_mad.c 2814 2005-07-06 19:14:09Z halr $
+ * $Id: user_mad.c 4010 2005-11-09 23:11:56Z roland $
  */
 
 #include <linux/module.h>
@@ -110,13 +110,13 @@ struct ib_umad_device {
 };
 
 struct ib_umad_file {
-        struct ib_umad_port *port;
-        struct list_head     recv_list;
-        struct list_head     port_list;
-        spinlock_t           recv_lock;
-        wait_queue_head_t    recv_wait;
-        struct ib_mad_agent *agent[IB_UMAD_MAX_AGENTS];
-        struct ib_mr        *mr[IB_UMAD_MAX_AGENTS];
+        struct ib_umad_port    *port;
+        struct list_head        recv_list;
+        struct list_head        port_list;
+        spinlock_t              recv_lock;
+        wait_queue_head_t       recv_wait;
+        struct ib_mad_agent    *agent[IB_UMAD_MAX_AGENTS];
+        int                     agents_dead;
 };
 
 struct ib_umad_packet {
@@ -145,6 +145,12 @@ static void ib_umad_release_dev(struct kref *ref)
         kfree(dev);
 }
 
+/* caller must hold port->mutex at least for reading */
+static struct ib_mad_agent *__get_agent(struct ib_umad_file *file, int id)
+{
+        return file->agents_dead ? NULL : file->agent[id];
+}
+
 static int queue_packet(struct ib_umad_file *file,
                         struct ib_mad_agent *agent,
                         struct ib_umad_packet *packet)
@@ -152,10 +158,11 @@ static int queue_packet(struct ib_umad_file *file,
         int ret = 1;
 
         down_read(&file->port->mutex);
+
         for (packet->mad.hdr.id = 0;
              packet->mad.hdr.id < IB_UMAD_MAX_AGENTS;
              packet->mad.hdr.id++)
-                if (agent == file->agent[packet->mad.hdr.id]) {
+                if (agent == __get_agent(file, packet->mad.hdr.id)) {
                         spin_lock_irq(&file->recv_lock);
                         list_add_tail(&packet->list, &file->recv_list);
                         spin_unlock_irq(&file->recv_lock);
@@ -327,7 +334,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
 
         down_read(&file->port->mutex);
 
-        agent = file->agent[packet->mad.hdr.id];
+        agent = __get_agent(file, packet->mad.hdr.id);
         if (!agent) {
                 ret = -EINVAL;
                 goto err_up;
@@ -481,7 +488,7 @@ static int ib_umad_reg_agent(struct ib_umad_file *file, unsigned long arg)
         }
 
         for (agent_id = 0; agent_id < IB_UMAD_MAX_AGENTS; ++agent_id)
-                if (!file->agent[agent_id])
+                if (!__get_agent(file, agent_id))
                         goto found;
 
         ret = -ENOMEM;
@@ -505,29 +512,15 @@ found:
                 goto out;
         }
 
-        file->agent[agent_id] = agent;
-
-        file->mr[agent_id] = ib_get_dma_mr(agent->qp->pd, IB_ACCESS_LOCAL_WRITE);
-        if (IS_ERR(file->mr[agent_id])) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
         if (put_user(agent_id,
                      (u32 __user *) (arg + offsetof(struct ib_user_mad_reg_req, id)))) {
                 ret = -EFAULT;
-                goto err_mr;
+                ib_unregister_mad_agent(agent);
+                goto out;
         }
 
+        file->agent[agent_id] = agent;
         ret = 0;
-        goto out;
-
-err_mr:
-        ib_dereg_mr(file->mr[agent_id]);
-
-err:
-        file->agent[agent_id] = NULL;
-        ib_unregister_mad_agent(agent);
 
 out:
         up_write(&file->port->mutex);
@@ -536,27 +529,29 @@ out:
 
 static int ib_umad_unreg_agent(struct ib_umad_file *file, unsigned long arg)
 {
+        struct ib_mad_agent *agent = NULL;
         u32 id;
         int ret = 0;
 
-        down_write(&file->port->mutex);
+        if (get_user(id, (u32 __user *) arg))
+                return -EFAULT;
 
-        if (get_user(id, (u32 __user *) arg)) {
-                ret = -EFAULT;
-                goto out;
-        }
+        down_write(&file->port->mutex);
 
-        if (id < 0 || id >= IB_UMAD_MAX_AGENTS || !file->agent[id]) {
+        if (id < 0 || id >= IB_UMAD_MAX_AGENTS || !__get_agent(file, id)) {
                 ret = -EINVAL;
                 goto out;
         }
 
-        ib_dereg_mr(file->mr[id]);
-        ib_unregister_mad_agent(file->agent[id]);
+        agent = file->agent[id];
         file->agent[id] = NULL;
 
 out:
         up_write(&file->port->mutex);
+
+        if (agent)
+                ib_unregister_mad_agent(agent);
+
         return ret;
 }
 
@@ -621,23 +616,29 @@ static int ib_umad_close(struct inode *inode, struct file *filp)
         struct ib_umad_file *file = filp->private_data;
         struct ib_umad_device *dev = file->port->umad_dev;
         struct ib_umad_packet *packet, *tmp;
+        int already_dead;
         int i;
 
         down_write(&file->port->mutex);
-        for (i = 0; i < IB_UMAD_MAX_AGENTS; ++i)
-                if (file->agent[i]) {
-                        ib_dereg_mr(file->mr[i]);
-                        ib_unregister_mad_agent(file->agent[i]);
-                }
+
+        already_dead = file->agents_dead;
+        file->agents_dead = 1;
 
         list_for_each_entry_safe(packet, tmp, &file->recv_list, list)
                 kfree(packet);
 
         list_del(&file->port_list);
-        up_write(&file->port->mutex);
 
-        kfree(file);
+        downgrade_write(&file->port->mutex);
+
+        if (!already_dead)
+                for (i = 0; i < IB_UMAD_MAX_AGENTS; ++i)
+                        if (file->agent[i])
+                                ib_unregister_mad_agent(file->agent[i]);
+
+        up_read(&file->port->mutex);
 
+        kfree(file);
         kref_put(&dev->ref, ib_umad_release_dev);
 
         return 0;
@@ -801,7 +802,7 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,
                 goto err_class;
         port->sm_dev->owner = THIS_MODULE;
         port->sm_dev->ops   = &umad_sm_fops;
-        kobject_set_name(&port->dev->kobj, "issm%d", port->dev_num);
+        kobject_set_name(&port->sm_dev->kobj, "issm%d", port->dev_num);
         if (cdev_add(port->sm_dev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1))
                 goto err_sm_cdev;
 
@@ -863,14 +864,36 @@ static void ib_umad_kill_port(struct ib_umad_port *port)
 
         port->ib_dev = NULL;
 
-        list_for_each_entry(file, &port->file_list, port_list)
-                for (id = 0; id < IB_UMAD_MAX_AGENTS; ++id) {
-                        if (!file->agent[id])
-                                continue;
-                        ib_dereg_mr(file->mr[id]);
-                        ib_unregister_mad_agent(file->agent[id]);
-                        file->agent[id] = NULL;
-                }
+        /*
+         * Now go through the list of files attached to this port and
+         * unregister all of their MAD agents.  We need to hold
+         * port->mutex while doing this to avoid racing with
+         * ib_umad_close(), but we can't hold the mutex for writing
+         * while calling ib_unregister_mad_agent(), since that might
+         * deadlock by calling back into queue_packet().  So we
+         * downgrade our lock to a read lock, and then drop and
+         * reacquire the write lock for the next iteration.
+         *
+         * We do list_del_init() on the file's list_head so that the
+         * list_del in ib_umad_close() is still OK, even after the
+         * file is removed from the list.
+         */
+        while (!list_empty(&port->file_list)) {
+                file = list_entry(port->file_list.next, struct ib_umad_file,
+                                  port_list);
+
+                file->agents_dead = 1;
+                list_del_init(&file->port_list);
+
+                downgrade_write(&port->mutex);
+
+                for (id = 0; id < IB_UMAD_MAX_AGENTS; ++id)
+                        if (file->agent[id])
+                                ib_unregister_mad_agent(file->agent[id]);
+
+                up_read(&port->mutex);
+                down_write(&port->mutex);
+        }
 
         up_write(&port->mutex);
 
@@ -913,7 +936,7 @@ static void ib_umad_add_one(struct ib_device *device)
 
 err:
         while (--i >= s)
-                ib_umad_kill_port(&umad_dev->port[i]);
+                ib_umad_kill_port(&umad_dev->port[i - s]);
 
         kref_put(&umad_dev->ref, ib_umad_release_dev);
 }
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 63a74151c60b..ed45da892b1c 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -708,7 +708,7 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file,
                 resp->wc[i].opcode         = wc[i].opcode;
                 resp->wc[i].vendor_err     = wc[i].vendor_err;
                 resp->wc[i].byte_len       = wc[i].byte_len;
-                resp->wc[i].imm_data       = wc[i].imm_data;
+                resp->wc[i].imm_data       = (__u32 __force) wc[i].imm_data;
                 resp->wc[i].qp_num         = wc[i].qp_num;
                 resp->wc[i].src_qp         = wc[i].src_qp;
                 resp->wc[i].wc_flags       = wc[i].wc_flags;
@@ -908,7 +908,12 @@ retry:
         if (ret)
                 goto err_destroy;
 
-        resp.qp_handle = uobj->uobject.id;
+        resp.qp_handle       = uobj->uobject.id;
+        resp.max_recv_sge    = attr.cap.max_recv_sge;
+        resp.max_send_sge    = attr.cap.max_send_sge;
+        resp.max_recv_wr     = attr.cap.max_recv_wr;
+        resp.max_send_wr     = attr.cap.max_send_wr;
+        resp.max_inline_data = attr.cap.max_inline_data;
 
         if (copy_to_user((void __user *) (unsigned long) cmd.response,
                          &resp, sizeof resp)) {
@@ -1135,7 +1140,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,
                 next->num_sge    = user_wr->num_sge;
                 next->opcode     = user_wr->opcode;
                 next->send_flags = user_wr->send_flags;
-                next->imm_data   = user_wr->imm_data;
+                next->imm_data   = (__be32 __force) user_wr->imm_data;
 
                 if (qp->qp_type == IB_QPT_UD) {
                         next->wr.ud.ah = idr_find(&ib_uverbs_ah_idr,
@@ -1701,7 +1706,6 @@ ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file,
         }
 
         attr.max_wr    = cmd.max_wr;
-        attr.max_sge   = cmd.max_sge;
         attr.srq_limit = cmd.srq_limit;
 
         ret = ib_modify_srq(srq, &attr, cmd.attr_mask);
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 4186cc888ea5..4c15e112736c 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -325,16 +325,8 @@ EXPORT_SYMBOL(ib_destroy_cq);
 int ib_resize_cq(struct ib_cq *cq,
                  int           cqe)
 {
-        int ret;
-
-        if (!cq->device->resize_cq)
-                return -ENOSYS;
-
-        ret = cq->device->resize_cq(cq, &cqe);
-        if (!ret)
-                cq->cqe = cqe;
-
-        return ret;
+        return cq->device->resize_cq ?
+                cq->device->resize_cq(cq, cqe) : -ENOSYS;
 }
 EXPORT_SYMBOL(ib_resize_cq);
 
diff --git a/drivers/infiniband/hw/mthca/mthca_catas.c b/drivers/infiniband/hw/mthca/mthca_catas.c
index 25ebab64bc42..c3bec7490f52 100644
--- a/drivers/infiniband/hw/mthca/mthca_catas.c
+++ b/drivers/infiniband/hw/mthca/mthca_catas.c
@@ -97,7 +97,7 @@ static void poll_catas(unsigned long dev_ptr)
                 }
 
         spin_lock_irqsave(&catas_lock, flags);
-        if (dev->catas_err.stop)
+        if (!dev->catas_err.stop)
                 mod_timer(&dev->catas_err.timer,
                           jiffies + MTHCA_CATAS_POLL_INTERVAL);
         spin_unlock_irqrestore(&catas_lock, flags);
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index 49f211d55df7..9ed34587fc5c 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -1060,6 +1060,8 @@ int mthca_QUERY_DEV_LIM(struct mthca_dev *dev,
                 dev_lim->hca.arbel.resize_srq = field & 1;
                 MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_SG_RQ_OFFSET);
                 dev_lim->max_sg = min_t(int, field, dev_lim->max_sg);
+                MTHCA_GET(size, outbox, QUERY_DEV_LIM_MAX_DESC_SZ_RQ_OFFSET);
+                dev_lim->max_desc_sz = min_t(int, size, dev_lim->max_desc_sz);
                 MTHCA_GET(size, outbox, QUERY_DEV_LIM_MPT_ENTRY_SZ_OFFSET);
                 dev_lim->mpt_entry_sz = size;
                 MTHCA_GET(field, outbox, QUERY_DEV_LIM_PBL_SZ_OFFSET);
diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
index f98e23555826..4a8adcef2079 100644
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
@@ -258,7 +258,7 @@ void mthca_cq_clean(struct mthca_dev *dev, u32 cqn, u32 qpn,
 {
         struct mthca_cq *cq;
         struct mthca_cqe *cqe;
-        int prod_index;
+        u32 prod_index;
         int nfreed = 0;
 
         spin_lock_irq(&dev->cq_table.lock);
@@ -293,19 +293,15 @@ void mthca_cq_clean(struct mthca_dev *dev, u32 cqn, u32 qpn,
          * Now sweep backwards through the CQ, removing CQ entries
          * that match our QP by copying older entries on top of them.
          */
-        while (prod_index > cq->cons_index) {
-                cqe = get_cqe(cq, (prod_index - 1) & cq->ibcq.cqe);
+        while ((int) --prod_index - (int) cq->cons_index >= 0) {
+                cqe = get_cqe(cq, prod_index & cq->ibcq.cqe);
                 if (cqe->my_qpn == cpu_to_be32(qpn)) {
                         if (srq)
                                 mthca_free_srq_wqe(srq, be32_to_cpu(cqe->wqe));
                         ++nfreed;
-                }
-                else if (nfreed)
-                        memcpy(get_cqe(cq, (prod_index - 1 + nfreed) &
-                                       cq->ibcq.cqe),
-                               cqe,
-                               MTHCA_CQ_ENTRY_SIZE);
-                --prod_index;
+                } else if (nfreed)
+                        memcpy(get_cqe(cq, (prod_index + nfreed) & cq->ibcq.cqe),
+                               cqe, MTHCA_CQ_ENTRY_SIZE);
         }
 
         if (nfreed) {
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index e7e5d3b4f004..497ff794ef6a 100644
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -131,6 +131,7 @@ struct mthca_limits {
         int      max_sg;
         int      num_qps;
         int      max_wqes;
+        int      max_desc_sz;
         int      max_qp_init_rdma;
         int      reserved_qps;
         int      num_srqs;
@@ -154,6 +155,7 @@ struct mthca_limits {
         int      reserved_mcgs;
         int      num_pds;
         int      reserved_pds;
+        u32      page_size_cap;
         u32      flags;
         u8       port_width_cap;
 };
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 45c6328e780c..6f94b25f3acd 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -168,6 +168,7 @@ static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim
         mdev->limits.max_srq_wqes       = dev_lim->max_srq_sz;
         mdev->limits.reserved_srqs      = dev_lim->reserved_srqs;
         mdev->limits.reserved_eecs      = dev_lim->reserved_eecs;
+        mdev->limits.max_desc_sz        = dev_lim->max_desc_sz;
         /*
          * Subtract 1 from the limit because we need to allocate a
          * spare CQE so the HCA HW can tell the difference between an
@@ -181,6 +182,7 @@ static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim
         mdev->limits.reserved_uars      = dev_lim->reserved_uars;
         mdev->limits.reserved_pds       = dev_lim->reserved_pds;
         mdev->limits.port_width_cap     = dev_lim->max_port_width;
+        mdev->limits.page_size_cap      = ~(u32) (dev_lim->min_page_sz - 1);
         mdev->limits.flags              = dev_lim->flags;
 
         /* IB_DEVICE_RESIZE_MAX_WR not supported by driver.
@@ -1196,7 +1198,6 @@ MODULE_DEVICE_TABLE(pci, mthca_pci_table);
 
 static struct pci_driver mthca_driver = {
         .name           = DRV_NAME,
-        .owner          = THIS_MODULE,
         .id_table       = mthca_pci_table,
         .probe          = mthca_init_one,
         .remove         = __devexit_p(mthca_remove_one)
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 6b0166668269..4cc7e2846df1 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -90,6 +90,7 @@ static int mthca_query_device(struct ib_device *ibdev,
         memcpy(&props->node_guid,      out_mad->data + 12, 8);
 
         props->max_mr_size         = ~0ull;
+        props->page_size_cap       = mdev->limits.page_size_cap;
         props->max_qp              = mdev->limits.num_qps - mdev->limits.reserved_qps;
         props->max_qp_wr           = mdev->limits.max_wqes;
         props->max_sge             = mdev->limits.max_sg;
@@ -615,11 +616,11 @@ static struct ib_qp *mthca_create_qp(struct ib_pd *pd,
                 return ERR_PTR(err);
         }
 
-        init_attr->cap.max_inline_data = 0;
         init_attr->cap.max_send_wr     = qp->sq.max;
         init_attr->cap.max_recv_wr     = qp->rq.max;
         init_attr->cap.max_send_sge    = qp->sq.max_gs;
         init_attr->cap.max_recv_sge    = qp->rq.max_gs;
+        init_attr->cap.max_inline_data = qp->max_inline_data;
 
         return &qp->ibqp;
 }
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h
index bcd4b01a339c..1e73947b4702 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.h
+++ b/drivers/infiniband/hw/mthca/mthca_provider.h
@@ -251,6 +251,7 @@ struct mthca_qp {
         struct mthca_wq        sq;
         enum ib_sig_type       sq_policy;
         int                    send_wqe_offset;
+        int                    max_inline_data;
 
         u64                   *wrid;
         union mthca_buf        queue;
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 8852ea477c21..760c418d5bc9 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -885,6 +885,48 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
         return err;
 }
 
+static void mthca_adjust_qp_caps(struct mthca_dev *dev,
+                                 struct mthca_pd *pd,
+                                 struct mthca_qp *qp)
+{
+        int max_data_size;
+
+        /*
+         * Calculate the maximum size of WQE s/g segments, excluding
+         * the next segment and other non-data segments.
+         */
+        max_data_size = min(dev->limits.max_desc_sz, 1 << qp->sq.wqe_shift) -
+                sizeof (struct mthca_next_seg);
+
+        switch (qp->transport) {
+        case MLX:
+                max_data_size -= 2 * sizeof (struct mthca_data_seg);
+                break;
+
+        case UD:
+                if (mthca_is_memfree(dev))
+                        max_data_size -= sizeof (struct mthca_arbel_ud_seg);
+                else
+                        max_data_size -= sizeof (struct mthca_tavor_ud_seg);
+                break;
+
+        default:
+                max_data_size -= sizeof (struct mthca_raddr_seg);
+                break;
+        }
+
+        /* We don't support inline data for kernel QPs (yet). */
+        if (!pd->ibpd.uobject)
+                qp->max_inline_data = 0;
+        else
+                qp->max_inline_data = max_data_size - MTHCA_INLINE_HEADER_SIZE;
+
+        qp->sq.max_gs = max_data_size / sizeof (struct mthca_data_seg);
+        qp->rq.max_gs = (min(dev->limits.max_desc_sz, 1 << qp->rq.wqe_shift) -
+                        sizeof (struct mthca_next_seg)) /
+                        sizeof (struct mthca_data_seg);
+}
+
 /*
  * Allocate and register buffer for WQEs.  qp->rq.max, sq.max,
  * rq.max_gs and sq.max_gs must all be assigned.
@@ -902,27 +944,53 @@ static int mthca_alloc_wqe_buf(struct mthca_dev *dev,
         size = sizeof (struct mthca_next_seg) +
                 qp->rq.max_gs * sizeof (struct mthca_data_seg);
 
+        if (size > dev->limits.max_desc_sz)
+                return -EINVAL;
+
         for (qp->rq.wqe_shift = 6; 1 << qp->rq.wqe_shift < size;
              qp->rq.wqe_shift++)
                 ; /* nothing */
 
-        size = sizeof (struct mthca_next_seg) +
-                qp->sq.max_gs * sizeof (struct mthca_data_seg);
+        size = qp->sq.max_gs * sizeof (struct mthca_data_seg);
         switch (qp->transport) {
         case MLX:
                 size += 2 * sizeof (struct mthca_data_seg);
                 break;
+
         case UD:
-                if (mthca_is_memfree(dev))
-                        size += sizeof (struct mthca_arbel_ud_seg);
-                else
-                        size += sizeof (struct mthca_tavor_ud_seg);
+                size += mthca_is_memfree(dev) ?
+                        sizeof (struct mthca_arbel_ud_seg) :
+                        sizeof (struct mthca_tavor_ud_seg);
                 break;
+
+        case UC:
+                size += sizeof (struct mthca_raddr_seg);
+                break;
+
+        case RC:
+                size += sizeof (struct mthca_raddr_seg);
+                /*
+                 * An atomic op will require an atomic segment, a
+                 * remote address segment and one scatter entry.
+                 */
+                size = max_t(int, size,
+                             sizeof (struct mthca_atomic_seg) +
+                             sizeof (struct mthca_raddr_seg) +
+                             sizeof (struct mthca_data_seg));
+                break;
+
         default:
-                /* bind seg is as big as atomic + raddr segs */
-                size += sizeof (struct mthca_bind_seg);
+                break;
         }
 
+        /* Make sure that we have enough space for a bind request */
+        size = max_t(int, size, sizeof (struct mthca_bind_seg));
+
+        size += sizeof (struct mthca_next_seg);
+
+        if (size > dev->limits.max_desc_sz)
+                return -EINVAL;
+
         for (qp->sq.wqe_shift = 6; 1 << qp->sq.wqe_shift < size;
              qp->sq.wqe_shift++)
                 ; /* nothing */
@@ -1066,6 +1134,8 @@ static int mthca_alloc_qp_common(struct mthca_dev *dev,
                 return ret;
         }
 
+        mthca_adjust_qp_caps(dev, pd, qp);
+
         /*
          * If this is a userspace QP, we're done now.  The doorbells
          * will be allocated and buffers will be initialized in
@@ -1486,8 +1556,8 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                                 }
 
                                 wqe += sizeof (struct mthca_atomic_seg);
-                                size += sizeof (struct mthca_raddr_seg) / 16 +
-                                        sizeof (struct mthca_atomic_seg);
+                                size += (sizeof (struct mthca_raddr_seg) +
+                                         sizeof (struct mthca_atomic_seg)) / 16;
                                 break;
 
                         case IB_WR_RDMA_WRITE:
@@ -1637,6 +1707,7 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
 {
         struct mthca_dev *dev = to_mdev(ibqp->device);
         struct mthca_qp *qp = to_mqp(ibqp);
+        __be32 doorbell[2];
         unsigned long flags;
         int err = 0;
         int nreq;
@@ -1654,6 +1725,22 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
         ind = qp->rq.next_ind;
 
         for (nreq = 0; wr; ++nreq, wr = wr->next) {
+                if (unlikely(nreq == MTHCA_TAVOR_MAX_WQES_PER_RECV_DB)) {
+                        nreq = 0;
+
+                        doorbell[0] = cpu_to_be32((qp->rq.next_ind << qp->rq.wqe_shift) | size0);
+                        doorbell[1] = cpu_to_be32(qp->qpn << 8);
+
+                        wmb();
+
+                        mthca_write64(doorbell,
+                                      dev->kar + MTHCA_RECEIVE_DOORBELL,
+                                      MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
+
+                        qp->rq.head += MTHCA_TAVOR_MAX_WQES_PER_RECV_DB;
+                        size0 = 0;
+                }
+
                 if (mthca_wq_overflow(&qp->rq, nreq, qp->ibqp.recv_cq)) {
                         mthca_err(dev, "RQ %06x full (%u head, %u tail,"
                                         " %d max, %d nreq)\n", qp->qpn,
@@ -1711,8 +1798,6 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
 
 out:
         if (likely(nreq)) {
-                __be32 doorbell[2];
-
                 doorbell[0] = cpu_to_be32((qp->rq.next_ind << qp->rq.wqe_shift) | size0);
                 doorbell[1] = cpu_to_be32((qp->qpn << 8) | nreq);
 
@@ -1806,8 +1891,8 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                                 }
 
                                 wqe += sizeof (struct mthca_atomic_seg);
-                                size += sizeof (struct mthca_raddr_seg) / 16 +
-                                        sizeof (struct mthca_atomic_seg);
+                                size += (sizeof (struct mthca_raddr_seg) +
+                                         sizeof (struct mthca_atomic_seg)) / 16;
                                 break;
 
                         case IB_WR_RDMA_READ:
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index 26d5161fde07..f7d234295efe 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -417,6 +417,7 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
 {
         struct mthca_dev *dev = to_mdev(ibsrq->device);
         struct mthca_srq *srq = to_msrq(ibsrq);
+        __be32 doorbell[2];
         unsigned long flags;
         int err = 0;
         int first_ind;
@@ -432,6 +433,25 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
         first_ind = srq->first_free;
 
         for (nreq = 0; wr; ++nreq, wr = wr->next) {
+                if (unlikely(nreq == MTHCA_TAVOR_MAX_WQES_PER_RECV_DB)) {
+                        nreq = 0;
+
+                        doorbell[0] = cpu_to_be32(first_ind << srq->wqe_shift);
+                        doorbell[1] = cpu_to_be32(srq->srqn << 8);
+
+                        /*
+                         * Make sure that descriptors are written
+                         * before doorbell is rung.
+                         */
+                        wmb();
+
+                        mthca_write64(doorbell,
+                                      dev->kar + MTHCA_RECEIVE_DOORBELL,
+                                      MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
+
+                        first_ind = srq->first_free;
+                }
+
                 ind = srq->first_free;
 
                 if (ind < 0) {
@@ -494,8 +514,6 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
         }
 
         if (likely(nreq)) {
-                __be32 doorbell[2];
-
                 doorbell[0] = cpu_to_be32(first_ind << srq->wqe_shift);
                 doorbell[1] = cpu_to_be32((srq->srqn << 8) | nreq);
 
diff --git a/drivers/infiniband/hw/mthca/mthca_wqe.h b/drivers/infiniband/hw/mthca/mthca_wqe.h
index 1f4c0ff28f79..73f1c0b9021e 100644
--- a/drivers/infiniband/hw/mthca/mthca_wqe.h
+++ b/drivers/infiniband/hw/mthca/mthca_wqe.h
@@ -49,7 +49,8 @@ enum {
 };
 
 enum {
-        MTHCA_INVAL_LKEY = 0x100
+        MTHCA_INVAL_LKEY                        = 0x100,
+        MTHCA_TAVOR_MAX_WQES_PER_RECV_DB        = 256
 };
 
 struct mthca_next_seg {
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 0095acc0fbbe..9923a15a9996 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -179,6 +179,7 @@ struct ipoib_dev_priv {
 #ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
         struct list_head fs_list;
         struct dentry *mcg_dentry;
+        struct dentry *path_dentry;
 #endif
 };
 
@@ -270,7 +271,6 @@ void ipoib_mcast_dev_flush(struct net_device *dev);
 
 #ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
 struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev);
-void ipoib_mcast_iter_free(struct ipoib_mcast_iter *iter);
 int ipoib_mcast_iter_next(struct ipoib_mcast_iter *iter);
 void ipoib_mcast_iter_read(struct ipoib_mcast_iter *iter,
                                   union ib_gid *gid,
@@ -278,6 +278,11 @@ void ipoib_mcast_iter_read(struct ipoib_mcast_iter *iter,
                                   unsigned int *queuelen,
                                   unsigned int *complete,
                                   unsigned int *send_only);
+
+struct ipoib_path_iter *ipoib_path_iter_init(struct net_device *dev);
+int ipoib_path_iter_next(struct ipoib_path_iter *iter);
+void ipoib_path_iter_read(struct ipoib_path_iter *iter,
+                          struct ipoib_path *path);
 #endif
 
 int ipoib_mcast_attach(struct net_device *dev, u16 mlid,
@@ -299,13 +304,13 @@ void ipoib_pkey_poll(void *dev);
 int ipoib_pkey_dev_delay_open(struct net_device *dev);
 
 #ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
-int ipoib_create_debug_file(struct net_device *dev);
-void ipoib_delete_debug_file(struct net_device *dev);
+void ipoib_create_debug_files(struct net_device *dev);
+void ipoib_delete_debug_files(struct net_device *dev);
 int ipoib_register_debugfs(void);
 void ipoib_unregister_debugfs(void);
 #else
-static inline int ipoib_create_debug_file(struct net_device *dev) { return 0; }
-static inline void ipoib_delete_debug_file(struct net_device *dev) { }
+static inline void ipoib_create_debug_files(struct net_device *dev) { }
+static inline void ipoib_delete_debug_files(struct net_device *dev) { }
 static inline int ipoib_register_debugfs(void) { return 0; }
 static inline void ipoib_unregister_debugfs(void) { }
 #endif
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_fs.c b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
index 38b150f775e7..685258e34034 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_fs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
@@ -43,6 +43,18 @@ struct file_operations;
 
 static struct dentry *ipoib_root;
 
+static void format_gid(union ib_gid *gid, char *buf)
+{
+        int i, n;
+
+        for (n = 0, i = 0; i < 8; ++i) {
+                n += sprintf(buf + n, "%x",
+                             be16_to_cpu(((__be16 *) gid->raw)[i]));
+                if (i < 7)
+                        buf[n++] = ':';
+        }
+}
+
 static void *ipoib_mcg_seq_start(struct seq_file *file, loff_t *pos)
 {
         struct ipoib_mcast_iter *iter;
@@ -54,7 +66,7 @@ static void *ipoib_mcg_seq_start(struct seq_file *file, loff_t *pos)
 
         while (n--) {
                 if (ipoib_mcast_iter_next(iter)) {
-                        ipoib_mcast_iter_free(iter);
+                        kfree(iter);
                         return NULL;
                 }
         }
@@ -70,7 +82,7 @@ static void *ipoib_mcg_seq_next(struct seq_file *file, void *iter_ptr,
         (*pos)++;
 
         if (ipoib_mcast_iter_next(iter)) {
-                ipoib_mcast_iter_free(iter);
+                kfree(iter);
                 return NULL;
         }
 
@@ -87,32 +99,32 @@ static int ipoib_mcg_seq_show(struct seq_file *file, void *iter_ptr)
         struct ipoib_mcast_iter *iter = iter_ptr;
         char gid_buf[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];
         union ib_gid mgid;
-        int i, n;
         unsigned long created;
         unsigned int queuelen, complete, send_only;
 
-        if (iter) {
-                ipoib_mcast_iter_read(iter, &mgid, &created, &queuelen,
-                                      &complete, &send_only);
+        if (!iter)
+                return 0;
 
-                for (n = 0, i = 0; i < sizeof mgid / 2; ++i) {
-                        n += sprintf(gid_buf + n, "%x",
-                                     be16_to_cpu(((__be16 *) mgid.raw)[i]));
-                        if (i < sizeof mgid / 2 - 1)
-                                gid_buf[n++] = ':';
-                }
-        }
+        ipoib_mcast_iter_read(iter, &mgid, &created, &queuelen,
+                              &complete, &send_only);
 
-        seq_printf(file, "GID: %*s", -(1 + (int) sizeof gid_buf), gid_buf);
+        format_gid(&mgid, gid_buf);
 
         seq_printf(file,
-                   " created: %10ld queuelen: %4d complete: %d send_only: %d\n",
-                   created, queuelen, complete, send_only);
+                   "GID: %s\n"
+                   "  created: %10ld\n"
+                   "  queuelen: %9d\n"
+                   "  complete: %9s\n"
+                   "  send_only: %8s\n"
+                   "\n",
+                   gid_buf, created, queuelen,
+                   complete ? "yes" : "no",
+                   send_only ? "yes" : "no");
 
         return 0;
 }
 
-static struct seq_operations ipoib_seq_ops = {
+static struct seq_operations ipoib_mcg_seq_ops = {
         .start = ipoib_mcg_seq_start,
         .next  = ipoib_mcg_seq_next,
         .stop  = ipoib_mcg_seq_stop,
@@ -124,7 +136,7 @@ static int ipoib_mcg_open(struct inode *inode, struct file *file)
         struct seq_file *seq;
         int ret;
 
-        ret = seq_open(file, &ipoib_seq_ops);
+        ret = seq_open(file, &ipoib_mcg_seq_ops);
         if (ret)
                 return ret;
 
@@ -134,7 +146,7 @@ static int ipoib_mcg_open(struct inode *inode, struct file *file)
         return 0;
 }
 
-static struct file_operations ipoib_fops = {
+static struct file_operations ipoib_mcg_fops = {
         .owner   = THIS_MODULE,
         .open    = ipoib_mcg_open,
         .read    = seq_read,
@@ -142,25 +154,138 @@ static struct file_operations ipoib_fops = {
         .release = seq_release
 };
 
-int ipoib_create_debug_file(struct net_device *dev)
+static void *ipoib_path_seq_start(struct seq_file *file, loff_t *pos)
+{
+        struct ipoib_path_iter *iter;
+        loff_t n = *pos;
+
+        iter = ipoib_path_iter_init(file->private);
+        if (!iter)
+                return NULL;
+
+        while (n--) {
+                if (ipoib_path_iter_next(iter)) {
+                        kfree(iter);
+                        return NULL;
+                }
+        }
+
+        return iter;
+}
+
+static void *ipoib_path_seq_next(struct seq_file *file, void *iter_ptr,
+                                   loff_t *pos)
+{
+        struct ipoib_path_iter *iter = iter_ptr;
+
+        (*pos)++;
+
+        if (ipoib_path_iter_next(iter)) {
+                kfree(iter);
+                return NULL;
+        }
+
+        return iter;
+}
+
+static void ipoib_path_seq_stop(struct seq_file *file, void *iter_ptr)
+{
+        /* nothing for now */
+}
+
+static int ipoib_path_seq_show(struct seq_file *file, void *iter_ptr)
+{
+        struct ipoib_path_iter *iter = iter_ptr;
+        char gid_buf[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];
+        struct ipoib_path path;
+        int rate;
+
+        if (!iter)
+                return 0;
+
+        ipoib_path_iter_read(iter, &path);
+
+        format_gid(&path.pathrec.dgid, gid_buf);
+
+        seq_printf(file,
+                   "GID: %s\n"
+                   "  complete: %6s\n",
+                   gid_buf, path.pathrec.dlid ? "yes" : "no");
+
+        if (path.pathrec.dlid) {
+                rate = ib_sa_rate_enum_to_int(path.pathrec.rate) * 25;
+
+                seq_printf(file,
+                           "  DLID:     0x%04x\n"
+                           "  SL: %12d\n"
+                           "  rate: %*d%s Gb/sec\n",
+                           be16_to_cpu(path.pathrec.dlid),
+                           path.pathrec.sl,
+                           10 - ((rate % 10) ? 2 : 0),
+                           rate / 10, rate % 10 ? ".5" : "");
+        }
+
+        seq_putc(file, '\n');
+
+        return 0;
+}
+
+static struct seq_operations ipoib_path_seq_ops = {
+        .start = ipoib_path_seq_start,
+        .next  = ipoib_path_seq_next,
+        .stop  = ipoib_path_seq_stop,
+        .show  = ipoib_path_seq_show,
+};
+
+static int ipoib_path_open(struct inode *inode, struct file *file)
+{
+        struct seq_file *seq;
+        int ret;
+
+        ret = seq_open(file, &ipoib_path_seq_ops);
+        if (ret)
+                return ret;
+
+        seq = file->private_data;
+        seq->private = inode->u.generic_ip;
+
+        return 0;
+}
+
+static struct file_operations ipoib_path_fops = {
+        .owner   = THIS_MODULE,
+        .open    = ipoib_path_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release
+};
+
+void ipoib_create_debug_files(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
-        char name[IFNAMSIZ + sizeof "_mcg"];
+        char name[IFNAMSIZ + sizeof "_path"];
 
         snprintf(name, sizeof name, "%s_mcg", dev->name);
-
         priv->mcg_dentry = debugfs_create_file(name, S_IFREG | S_IRUGO,
-                                               ipoib_root, dev, &ipoib_fops);
-
-        return priv->mcg_dentry ? 0 : -ENOMEM;
+                                               ipoib_root, dev, &ipoib_mcg_fops);
+        if (!priv->mcg_dentry)
+                ipoib_warn(priv, "failed to create mcg debug file\n");
+
+        snprintf(name, sizeof name, "%s_path", dev->name);
+        priv->path_dentry = debugfs_create_file(name, S_IFREG | S_IRUGO,
+                                                ipoib_root, dev, &ipoib_path_fops);
+        if (!priv->path_dentry)
+                ipoib_warn(priv, "failed to create path debug file\n");
 }
 
-void ipoib_delete_debug_file(struct net_device *dev)
+void ipoib_delete_debug_files(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
         if (priv->mcg_dentry)
                 debugfs_remove(priv->mcg_dentry);
+        if (priv->path_dentry)
+                debugfs_remove(priv->path_dentry);
 }
 
 int ipoib_register_debugfs(void)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index ce0296273e76..2fa30751f362 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -58,6 +58,11 @@ module_param_named(debug_level, ipoib_debug_level, int, 0644);
 MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0");
 #endif
 
+struct ipoib_path_iter {
+        struct net_device *dev;
+        struct ipoib_path  path;
+};
+
 static const u8 ipv4_bcast_addr[] = {
         0x00, 0xff, 0xff, 0xff,
         0xff, 0x12, 0x40, 0x1b, 0x00, 0x00, 0x00, 0x00,
@@ -250,6 +255,64 @@ static void path_free(struct net_device *dev, struct ipoib_path *path)
         kfree(path);
 }
 
+#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
+
+struct ipoib_path_iter *ipoib_path_iter_init(struct net_device *dev)
+{
+        struct ipoib_path_iter *iter;
+
+        iter = kmalloc(sizeof *iter, GFP_KERNEL);
+        if (!iter)
+                return NULL;
+
+        iter->dev = dev;
+        memset(iter->path.pathrec.dgid.raw, 0, 16);
+
+        if (ipoib_path_iter_next(iter)) {
+                kfree(iter);
+                return NULL;
+        }
+
+        return iter;
+}
+
+int ipoib_path_iter_next(struct ipoib_path_iter *iter)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(iter->dev);
+        struct rb_node *n;
+        struct ipoib_path *path;
+        int ret = 1;
+
+        spin_lock_irq(&priv->lock);
+
+        n = rb_first(&priv->path_tree);
+
+        while (n) {
+                path = rb_entry(n, struct ipoib_path, rb_node);
+
+                if (memcmp(iter->path.pathrec.dgid.raw, path->pathrec.dgid.raw,
+                           sizeof (union ib_gid)) < 0) {
+                        iter->path = *path;
+                        ret = 0;
+                        break;
+                }
+
+                n = rb_next(n);
+        }
+
+        spin_unlock_irq(&priv->lock);
+
+        return ret;
+}
+
+void ipoib_path_iter_read(struct ipoib_path_iter *iter,
+                          struct ipoib_path *path)
+{
+        *path = iter->path;
+}
+
+#endif /* CONFIG_INFINIBAND_IPOIB_DEBUG */
+
 void ipoib_flush_paths(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
@@ -763,7 +826,7 @@ void ipoib_dev_cleanup(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev), *cpriv, *tcpriv;
 
-        ipoib_delete_debug_file(dev);
+        ipoib_delete_debug_files(dev);
 
         /* Delete any child interfaces first */
         list_for_each_entry_safe(cpriv, tcpriv, &priv->child_intfs, list) {
@@ -972,8 +1035,7 @@ static struct net_device *ipoib_add_port(const char *format,
                 goto register_failed;
         }
 
-        if (ipoib_create_debug_file(priv->dev))
-                goto debug_failed;
+        ipoib_create_debug_files(priv->dev);
 
         if (ipoib_add_pkey_attr(priv->dev))
                 goto sysfs_failed;
@@ -987,9 +1049,7 @@ static struct net_device *ipoib_add_port(const char *format,
         return priv->dev;
 
 sysfs_failed:
-        ipoib_delete_debug_file(priv->dev);
-
-debug_failed:
+        ipoib_delete_debug_files(priv->dev);
         unregister_netdev(priv->dev);
 
 register_failed:
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 3ecf78a9493a..c33ed87f9dff 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -120,12 +120,8 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)
         if (mcast->ah)
                 ipoib_put_ah(mcast->ah);
 
-        while (!skb_queue_empty(&mcast->pkt_queue)) {
-                struct sk_buff *skb = skb_dequeue(&mcast->pkt_queue);
-
-                skb->dev = dev;
-                dev_kfree_skb_any(skb);
-        }
+        while (!skb_queue_empty(&mcast->pkt_queue))
+                dev_kfree_skb_any(skb_dequeue(&mcast->pkt_queue));
 
         kfree(mcast);
 }
@@ -317,13 +313,8 @@ ipoib_mcast_sendonly_join_complete(int status,
                                         IPOIB_GID_ARG(mcast->mcmember.mgid), status);
 
                 /* Flush out any queued packets */
-                while (!skb_queue_empty(&mcast->pkt_queue)) {
-                        struct sk_buff *skb = skb_dequeue(&mcast->pkt_queue);
-
-                        skb->dev = dev;
-
-                        dev_kfree_skb_any(skb);
-                }
+                while (!skb_queue_empty(&mcast->pkt_queue))
+                        dev_kfree_skb_any(skb_dequeue(&mcast->pkt_queue));
 
                 /* Clear the busy flag so we try again */
                 clear_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags);
@@ -928,21 +919,16 @@ struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev)
                 return NULL;
 
         iter->dev = dev;
-        memset(iter->mgid.raw, 0, sizeof iter->mgid);
+        memset(iter->mgid.raw, 0, 16);
 
         if (ipoib_mcast_iter_next(iter)) {
-                ipoib_mcast_iter_free(iter);
+                kfree(iter);
                 return NULL;
         }
 
         return iter;
 }
 
-void ipoib_mcast_iter_free(struct ipoib_mcast_iter *iter)
-{
-        kfree(iter);
-}
-
 int ipoib_mcast_iter_next(struct ipoib_mcast_iter *iter)
 {
         struct ipoib_dev_priv *priv = netdev_priv(iter->dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 332d730e60c2..d280b341a37f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -113,8 +113,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
 
         priv->parent = ppriv->dev;
 
-        if (ipoib_create_debug_file(priv->dev))
-                goto debug_failed;
+        ipoib_create_debug_files(priv->dev);
 
         if (ipoib_add_pkey_attr(priv->dev))
                 goto sysfs_failed;
@@ -130,9 +129,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
         return 0;
 
 sysfs_failed:
-        ipoib_delete_debug_file(priv->dev);
-
-debug_failed:
+        ipoib_delete_debug_files(priv->dev);
         unregister_netdev(priv->dev);
 
 register_failed:
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index d00d14bb637a..64672d491222 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -259,17 +259,17 @@ static void corgikbd_hinge_timer(unsigned long data)
 }
 
 #ifdef CONFIG_PM
-static int corgikbd_suspend(struct device *dev, pm_message_t state)
+static int corgikbd_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct corgikbd *corgikbd = dev_get_drvdata(dev);
+        struct corgikbd *corgikbd = platform_get_drvdata(dev);
         corgikbd->suspended = 1;
 
         return 0;
 }
 
-static int corgikbd_resume(struct device *dev)
+static int corgikbd_resume(struct platform_device *dev)
 {
-        struct corgikbd *corgikbd = dev_get_drvdata(dev);
+        struct corgikbd *corgikbd = platform_get_drvdata(dev);
 
         /* Upon resume, ignore the suspend key for a short while */
         corgikbd->suspend_jiffies=jiffies;
@@ -282,7 +282,7 @@ static int corgikbd_resume(struct device *dev)
 #define corgikbd_resume         NULL
 #endif
 
-static int __init corgikbd_probe(struct device *dev)
+static int __init corgikbd_probe(struct platform_device *pdev)
 {
         struct corgikbd *corgikbd;
         struct input_dev *input_dev;
@@ -296,7 +296,7 @@ static int __init corgikbd_probe(struct device *dev)
                 return -ENOMEM;
         }
 
-        dev_set_drvdata(dev, corgikbd);
+        platform_set_drvdata(pdev, corgikbd);
 
         corgikbd->input = input_dev;
         spin_lock_init(&corgikbd->lock);
@@ -321,7 +321,7 @@ static int __init corgikbd_probe(struct device *dev)
         input_dev->id.vendor = 0x0001;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = dev;
+        input_dev->cdev.dev = &pdev->dev;
         input_dev->private = corgikbd;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW);
@@ -356,10 +356,10 @@ static int __init corgikbd_probe(struct device *dev)
         return 0;
 }
 
-static int corgikbd_remove(struct device *dev)
+static int corgikbd_remove(struct platform_device *pdev)
 {
         int i;
-        struct corgikbd *corgikbd = dev_get_drvdata(dev);
+        struct corgikbd *corgikbd = platform_get_drvdata(pdev);
 
         for (i = 0; i < CORGI_KEY_SENSE_NUM; i++)
                 free_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd);
@@ -374,23 +374,24 @@ static int corgikbd_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver corgikbd_driver = {
-        .name           = "corgi-keyboard",
-        .bus            = &platform_bus_type,
+static struct platform_driver corgikbd_driver = {
         .probe          = corgikbd_probe,
         .remove         = corgikbd_remove,
         .suspend        = corgikbd_suspend,
         .resume         = corgikbd_resume,
+        .driver         = {
+                .name   = "corgi-keyboard",
+        },
 };
 
 static int __devinit corgikbd_init(void)
 {
-        return driver_register(&corgikbd_driver);
+        return platform_driver_register(&corgikbd_driver);
 }
 
 static void __exit corgikbd_exit(void)
 {
-        driver_unregister(&corgikbd_driver);
+        platform_driver_unregister(&corgikbd_driver);
 }
 
 module_init(corgikbd_init);
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 0fa38a559cdf..6a15fe3bc527 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -309,10 +309,10 @@ static void spitzkbd_hinge_timer(unsigned long data)
 }
 
 #ifdef CONFIG_PM
-static int spitzkbd_suspend(struct device *dev, pm_message_t state)
+static int spitzkbd_suspend(struct platform_device *dev, pm_message_t state)
 {
         int i;
-        struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+        struct spitzkbd *spitzkbd = platform_get_drvdata(dev);
         spitzkbd->suspended = 1;
 
         /* Set Strobe lines as inputs - *except* strobe line 0 leave this
@@ -323,10 +323,10 @@ static int spitzkbd_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int spitzkbd_resume(struct device *dev)
+static int spitzkbd_resume(struct platform_device *dev)
 {
         int i;
-        struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+        struct spitzkbd *spitzkbd = platform_get_drvdata(dev);
 
         for (i = 0; i < SPITZ_KEY_STROBE_NUM; i++)
                 pxa_gpio_mode(spitz_strobes[i] | GPIO_OUT | GPIO_DFLT_HIGH);
@@ -342,7 +342,7 @@ static int spitzkbd_resume(struct device *dev)
 #define spitzkbd_resume         NULL
 #endif
 
-static int __init spitzkbd_probe(struct device *dev)
+static int __init spitzkbd_probe(struct platform_device *dev)
 {
         struct spitzkbd *spitzkbd;
         struct input_dev *input_dev;
@@ -358,7 +358,7 @@ static int __init spitzkbd_probe(struct device *dev)
                 return -ENOMEM;
         }
 
-        dev_set_drvdata(dev, spitzkbd);
+        platform_set_drvdata(dev, spitzkbd);
         strcpy(spitzkbd->phys, "spitzkbd/input0");
 
         spin_lock_init(&spitzkbd->lock);
@@ -380,7 +380,7 @@ static int __init spitzkbd_probe(struct device *dev)
         input_dev->private = spitzkbd;
         input_dev->name = "Spitz Keyboard";
         input_dev->phys = spitzkbd->phys;
-        input_dev->cdev.dev = dev;
+        input_dev->cdev.dev = &dev->dev;
 
         input_dev->id.bustype = BUS_HOST;
         input_dev->id.vendor = 0x0001;
@@ -437,10 +437,10 @@ static int __init spitzkbd_probe(struct device *dev)
         return 0;
 }
 
-static int spitzkbd_remove(struct device *dev)
+static int spitzkbd_remove(struct platform_device *dev)
 {
         int i;
-        struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+        struct spitzkbd *spitzkbd = platform_get_drvdata(dev);
 
         for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++)
                 free_irq(IRQ_GPIO(spitz_senses[i]), spitzkbd);
@@ -460,23 +460,24 @@ static int spitzkbd_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver spitzkbd_driver = {
-        .name           = "spitz-keyboard",
-        .bus            = &platform_bus_type,
+static struct platform_driver spitzkbd_driver = {
         .probe          = spitzkbd_probe,
         .remove         = spitzkbd_remove,
         .suspend        = spitzkbd_suspend,
         .resume         = spitzkbd_resume,
+        .driver         = {
+                .name   = "spitz-keyboard",
+        },
 };
 
 static int __devinit spitzkbd_init(void)
 {
-        return driver_register(&spitzkbd_driver);
+        return platform_driver_register(&spitzkbd_driver);
 }
 
 static void __exit spitzkbd_exit(void)
 {
-        driver_unregister(&spitzkbd_driver);
+        platform_driver_unregister(&spitzkbd_driver);
 }
 
 module_init(spitzkbd_init);
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 01e186422021..ac86c1d1d83e 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -912,7 +912,7 @@ static long i8042_panic_blink(long count)
  * Here we try to restore the original BIOS settings
  */
 
-static int i8042_suspend(struct device *dev, pm_message_t state)
+static int i8042_suspend(struct platform_device *dev, pm_message_t state)
 {
         del_timer_sync(&i8042_timer);
         i8042_controller_reset();
@@ -925,7 +925,7 @@ static int i8042_suspend(struct device *dev, pm_message_t state)
  * Here we try to reset everything back to a state in which suspended
  */
 
-static int i8042_resume(struct device *dev)
+static int i8042_resume(struct platform_device *dev)
 {
         int i;
 
@@ -964,17 +964,18 @@ static int i8042_resume(struct device *dev)
  * because otherwise BIOSes will be confused.
  */
 
-static void i8042_shutdown(struct device *dev)
+static void i8042_shutdown(struct platform_device *dev)
 {
         i8042_controller_cleanup();
 }
 
-static struct device_driver i8042_driver = {
-        .name           = "i8042",
-        .bus            = &platform_bus_type,
+static struct platform_driver i8042_driver = {
         .suspend        = i8042_suspend,
         .resume         = i8042_resume,
         .shutdown       = i8042_shutdown,
+        .driver         = {
+                .name   = "i8042",
+        },
 };
 
 static int __init i8042_create_kbd_port(void)
@@ -1078,7 +1079,7 @@ static int __init i8042_init(void)
                 goto err_platform_exit;
         }
 
-        err = driver_register(&i8042_driver);
+        err = platform_driver_register(&i8042_driver);
         if (err)
                 goto err_controller_cleanup;
 
@@ -1126,7 +1127,7 @@ static int __init i8042_init(void)
  err_unregister_device:
         platform_device_unregister(i8042_platform_device);
  err_unregister_driver:
-        driver_unregister(&i8042_driver);
+        platform_driver_unregister(&i8042_driver);
  err_controller_cleanup:
         i8042_controller_cleanup();
  err_platform_exit:
@@ -1148,7 +1149,7 @@ static void __exit i8042_exit(void)
         del_timer_sync(&i8042_timer);
 
         platform_device_unregister(i8042_platform_device);
-        driver_unregister(&i8042_driver);
+        platform_driver_unregister(&i8042_driver);
 
         i8042_platform_exit();
 
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index 52c49258f8a4..a3bd11589bc3 100644
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -107,7 +107,7 @@ static void rpckbd_close(struct serio *port)
  * Allocate and initialize serio structure for subsequent registration
  * with serio core.
  */
-static int __devinit rpckbd_probe(struct device *dev)
+static int __devinit rpckbd_probe(struct platform_device *dev)
 {
         struct serio *serio;
 
@@ -120,37 +120,38 @@ static int __devinit rpckbd_probe(struct device *dev)
         serio->write            = rpckbd_write;
         serio->open             = rpckbd_open;
         serio->close            = rpckbd_close;
-        serio->dev.parent       = dev;
+        serio->dev.parent       = &dev->dev;
         strlcpy(serio->name, "RiscPC PS/2 kbd port", sizeof(serio->name));
         strlcpy(serio->phys, "rpckbd/serio0", sizeof(serio->phys));
 
-        dev_set_drvdata(dev, serio);
+        platform_set_drvdata(dev, serio);
         serio_register_port(serio);
         return 0;
 }
 
-static int __devexit rpckbd_remove(struct device *dev)
+static int __devexit rpckbd_remove(struct platform_device *dev)
 {
-        struct serio *serio = dev_get_drvdata(dev);
+        struct serio *serio = platform_get_drvdata(dev);
         serio_unregister_port(serio);
         return 0;
 }
 
-static struct device_driver rpckbd_driver = {
-        .name           = "kart",
-        .bus            = &platform_bus_type,
+static struct platform_driver rpckbd_driver = {
         .probe          = rpckbd_probe,
         .remove         = __devexit_p(rpckbd_remove),
+        .driver         = {
+                .name   = "kart",
+        },
 };
 
 static int __init rpckbd_init(void)
 {
-        return driver_register(&rpckbd_driver);
+        return platform_driver_register(&rpckbd_driver);
 }
 
 static void __exit rpckbd_exit(void)
 {
-        driver_unregister(&rpckbd_driver);
+        platform_driver_unregister(&rpckbd_driver);
 }
 
 module_init(rpckbd_init);
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 15e88eeae8d6..1042987856f7 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -231,9 +231,9 @@ static irqreturn_t ts_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_PM
-static int corgits_suspend(struct device *dev, pm_message_t state)
+static int corgits_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
+        struct corgi_ts *corgi_ts = platform_get_drvdata(dev);
 
         if (corgi_ts->pendown) {
                 del_timer_sync(&corgi_ts->timer);
@@ -248,9 +248,9 @@ static int corgits_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int corgits_resume(struct device *dev)
+static int corgits_resume(struct platform_device *dev)
 {
-        struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
+        struct corgi_ts *corgi_ts = platform_get_drvdata(dev);
 
         corgi_ssp_ads7846_putget((4u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
         /* Enable Falling Edge */
@@ -264,10 +264,9 @@ static int corgits_resume(struct device *dev)
 #define corgits_resume          NULL
 #endif
 
-static int __init corgits_probe(struct device *dev)
+static int __init corgits_probe(struct platform_device *pdev)
 {
         struct corgi_ts *corgi_ts;
-        struct platform_device *pdev = to_platform_device(dev);
         struct input_dev *input_dev;
         int err = -ENOMEM;
 
@@ -276,9 +275,9 @@ static int __init corgits_probe(struct device *dev)
         if (!corgi_ts || !input_dev)
                 goto fail;
 
-        dev_set_drvdata(dev, corgi_ts);
+        platform_set_drvdata(pdev, corgi_ts);
 
-        corgi_ts->machinfo = dev->platform_data;
+        corgi_ts->machinfo = pdev->dev.platform_data;
         corgi_ts->irq_gpio = platform_get_irq(pdev, 0);
 
         if (corgi_ts->irq_gpio < 0) {
@@ -298,7 +297,7 @@ static int __init corgits_probe(struct device *dev)
         input_dev->id.vendor = 0x0001;
         input_dev->id.product = 0x0002;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = dev;
+        input_dev->cdev.dev = &pdev->dev;
         input_dev->private = corgi_ts;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
@@ -339,9 +338,9 @@ static int __init corgits_probe(struct device *dev)
 
 }
 
-static int corgits_remove(struct device *dev)
+static int corgits_remove(struct platform_device *pdev)
 {
-        struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
+        struct corgi_ts *corgi_ts = platform_get_drvdata(pdev);
 
         free_irq(corgi_ts->irq_gpio, NULL);
         del_timer_sync(&corgi_ts->timer);
@@ -351,23 +350,24 @@ static int corgits_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver corgits_driver = {
-        .name           = "corgi-ts",
-        .bus            = &platform_bus_type,
+static struct platform_driver corgits_driver = {
         .probe          = corgits_probe,
         .remove         = corgits_remove,
         .suspend        = corgits_suspend,
         .resume         = corgits_resume,
+        .driver         = {
+                .name   = "corgi-ts",
+        },
 };
 
 static int __devinit corgits_init(void)
 {
-        return driver_register(&corgits_driver);
+        return platform_driver_register(&corgits_driver);
 }
 
 static void __exit corgits_exit(void)
 {
-        driver_unregister(&corgits_driver);
+        platform_driver_unregister(&corgits_driver);
 }
 
 module_init(corgits_init);
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index 7daa0ed7331c..1eab7cffceaa 100644
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -138,9 +138,8 @@ static struct mcp_ops mcp_sa11x0 = {
         .disable                = mcp_sa11x0_disable,
 };
 
-static int mcp_sa11x0_probe(struct device *dev)
+static int mcp_sa11x0_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct mcp_plat_data *data = pdev->dev.platform_data;
         struct mcp *mcp;
         int ret;
@@ -165,7 +164,7 @@ static int mcp_sa11x0_probe(struct device *dev)
         mcp->dma_telco_rd       = DMA_Ser4MCP1Rd;
         mcp->dma_telco_wr       = DMA_Ser4MCP1Wr;
 
-        dev_set_drvdata(dev, mcp);
+        platform_set_drvdata(pdev, mcp);
 
         if (machine_is_assabet()) {
                 ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);
@@ -202,26 +201,26 @@ static int mcp_sa11x0_probe(struct device *dev)
 
  release:
         release_mem_region(0x80060000, 0x60);
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
  out:
         return ret;
 }
 
-static int mcp_sa11x0_remove(struct device *dev)
+static int mcp_sa11x0_remove(struct platform_device *dev)
 {
-        struct mcp *mcp = dev_get_drvdata(dev);
+        struct mcp *mcp = platform_get_drvdata(dev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
         mcp_host_unregister(mcp);
         release_mem_region(0x80060000, 0x60);
 
         return 0;
 }
 
-static int mcp_sa11x0_suspend(struct device *dev, pm_message_t state)
+static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct mcp *mcp = dev_get_drvdata(dev);
+        struct mcp *mcp = platform_get_drvdata(dev);
 
         priv(mcp)->mccr0 = Ser4MCCR0;
         priv(mcp)->mccr1 = Ser4MCCR1;
@@ -230,9 +229,9 @@ static int mcp_sa11x0_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int mcp_sa11x0_resume(struct device *dev)
+static int mcp_sa11x0_resume(struct platform_device *dev)
 {
-        struct mcp *mcp = dev_get_drvdata(dev);
+        struct mcp *mcp = platform_get_drvdata(dev);
 
         Ser4MCCR1 = priv(mcp)->mccr1;
         Ser4MCCR0 = priv(mcp)->mccr0;
@@ -243,13 +242,14 @@ static int mcp_sa11x0_resume(struct device *dev)
 /*
  * The driver for the SA11x0 MCP port.
  */
-static struct device_driver mcp_sa11x0_driver = {
-        .name           = "sa11x0-mcp",
-        .bus            = &platform_bus_type,
+static struct platform_driver mcp_sa11x0_driver = {
         .probe          = mcp_sa11x0_probe,
         .remove         = mcp_sa11x0_remove,
         .suspend        = mcp_sa11x0_suspend,
         .resume         = mcp_sa11x0_resume,
+        .driver         = {
+                .name   = "sa11x0-mcp",
+        },
 };
 
 /*
@@ -257,12 +257,12 @@ static struct device_driver mcp_sa11x0_driver = {
  */
 static int __init mcp_sa11x0_init(void)
 {
-        return driver_register(&mcp_sa11x0_driver);
+        return platform_driver_register(&mcp_sa11x0_driver);
 }
 
 static void __exit mcp_sa11x0_exit(void)
 {
-        driver_unregister(&mcp_sa11x0_driver);
+        platform_driver_unregister(&mcp_sa11x0_driver);
 }
 
 module_init(mcp_sa11x0_init);
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
index bc2b72b32905..11a801be71c8 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -26,8 +26,8 @@
 
 #define SKY_CPUSTATE_VERSION            "1.1"
 
-static int hdpu_cpustate_probe(struct device *ddev);
-static int hdpu_cpustate_remove(struct device *ddev);
+static int hdpu_cpustate_probe(struct platform_device *pdev);
+static int hdpu_cpustate_remove(struct platform_device *pdev);
 
 struct cpustate_t cpustate;
 
@@ -158,11 +158,12 @@ static int cpustate_read_proc(char *page, char **start, off_t off,
         return len;
 }
 
-static struct device_driver hdpu_cpustate_driver = {
-        .name = HDPU_CPUSTATE_NAME,
-        .bus = &platform_bus_type,
+static struct platform_driver hdpu_cpustate_driver = {
         .probe = hdpu_cpustate_probe,
         .remove = hdpu_cpustate_remove,
+        .driver = {
+                .name = HDPU_CPUSTATE_NAME,
+        },
 };
 
 /*
@@ -187,9 +188,8 @@ static struct miscdevice cpustate_dev = {
         &cpustate_fops
 };
 
-static int hdpu_cpustate_probe(struct device *ddev)
+static int hdpu_cpustate_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(ddev);
         struct resource *res;
         struct proc_dir_entry *proc_de;
         int ret;
@@ -217,7 +217,7 @@ static int hdpu_cpustate_probe(struct device *ddev)
         return 0;
 }
 
-static int hdpu_cpustate_remove(struct device *ddev)
+static int hdpu_cpustate_remove(struct platform_device *pdev)
 {
 
         cpustate.set_addr = NULL;
@@ -232,13 +232,13 @@ static int hdpu_cpustate_remove(struct device *ddev)
 static int __init cpustate_init(void)
 {
         int rc;
-        rc = driver_register(&hdpu_cpustate_driver);
+        rc = platform_driver_register(&hdpu_cpustate_driver);
         return rc;
 }
 
 static void __exit cpustate_exit(void)
 {
-        driver_unregister(&hdpu_cpustate_driver);
+        platform_driver_unregister(&hdpu_cpustate_driver);
 }
 
 module_init(cpustate_init);
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 4bb461793851..ea9d5f233c83 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -22,19 +22,20 @@
 
 #include <linux/platform_device.h>
 
-static int hdpu_nexus_probe(struct device *ddev);
-static int hdpu_nexus_remove(struct device *ddev);
+static int hdpu_nexus_probe(struct platform_device *pdev);
+static int hdpu_nexus_remove(struct platform_device *pdev);
 
 static struct proc_dir_entry *hdpu_slot_id;
 static struct proc_dir_entry *hdpu_chassis_id;
 static int slot_id = -1;
 static int chassis_id = -1;
 
-static struct device_driver hdpu_nexus_driver = {
-        .name = HDPU_NEXUS_NAME,
-        .bus = &platform_bus_type,
+static struct platform_driver hdpu_nexus_driver = {
         .probe = hdpu_nexus_probe,
         .remove = hdpu_nexus_remove,
+        .driver = {
+                .name = HDPU_NEXUS_NAME,
+        },
 };
 
 int hdpu_slot_id_read(char *buffer, char **buffer_location, off_t offset,
@@ -55,9 +56,8 @@ int hdpu_chassis_id_read(char *buffer, char **buffer_location, off_t offset,
         return sprintf(buffer, "%d\n", chassis_id);
 }
 
-static int hdpu_nexus_probe(struct device *ddev)
+static int hdpu_nexus_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(ddev);
         struct resource *res;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -80,7 +80,7 @@ static int hdpu_nexus_probe(struct device *ddev)
         return 0;
 }
 
-static int hdpu_nexus_remove(struct device *ddev)
+static int hdpu_nexus_remove(struct platform_device *pdev)
 {
         slot_id = -1;
         chassis_id = -1;
@@ -94,13 +94,13 @@ static int hdpu_nexus_remove(struct device *ddev)
 static int __init nexus_init(void)
 {
         int rc;
-        rc = driver_register(&hdpu_nexus_driver);
+        rc = platform_driver_register(&hdpu_nexus_driver);
         return rc;
 }
 
 static void __exit nexus_exit(void)
 {
-        driver_unregister(&hdpu_nexus_driver);
+        platform_driver_unregister(&hdpu_nexus_driver);
 }
 
 module_init(nexus_init);
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index f31e247b2cbe..ee8f8a0420d1 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -428,9 +428,8 @@ static irqreturn_t pxamci_detect_irq(int irq, void *devid, struct pt_regs *regs)
         return IRQ_HANDLED;
 }
 
-static int pxamci_probe(struct device *dev)
+static int pxamci_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct mmc_host *mmc;
         struct pxamci_host *host = NULL;
         struct resource *r;
@@ -445,7 +444,7 @@ static int pxamci_probe(struct device *dev)
         if (!r)
                 return -EBUSY;
 
-        mmc = mmc_alloc_host(sizeof(struct pxamci_host), dev);
+        mmc = mmc_alloc_host(sizeof(struct pxamci_host), &pdev->dev);
         if (!mmc) {
                 ret = -ENOMEM;
                 goto out;
@@ -474,7 +473,7 @@ static int pxamci_probe(struct device *dev)
                          host->pdata->ocr_mask :
                          MMC_VDD_32_33|MMC_VDD_33_34;
 
-        host->sg_cpu = dma_alloc_coherent(dev, PAGE_SIZE, &host->sg_dma, GFP_KERNEL);
+        host->sg_cpu = dma_alloc_coherent(&pdev->dev, PAGE_SIZE, &host->sg_dma, GFP_KERNEL);
         if (!host->sg_cpu) {
                 ret = -ENOMEM;
                 goto out;
@@ -511,10 +510,10 @@ static int pxamci_probe(struct device *dev)
         if (ret)
                 goto out;
 
-        dev_set_drvdata(dev, mmc);
+        platform_set_drvdata(pdev, mmc);
 
         if (host->pdata && host->pdata->init)
-                host->pdata->init(dev, pxamci_detect_irq, mmc);
+                host->pdata->init(&pdev->dev, pxamci_detect_irq, mmc);
 
         mmc_add_host(mmc);
 
@@ -527,7 +526,7 @@ static int pxamci_probe(struct device *dev)
                 if (host->base)
                         iounmap(host->base);
                 if (host->sg_cpu)
-                        dma_free_coherent(dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
+                        dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
         }
         if (mmc)
                 mmc_free_host(mmc);
@@ -535,17 +534,17 @@ static int pxamci_probe(struct device *dev)
         return ret;
 }
 
-static int pxamci_remove(struct device *dev)
+static int pxamci_remove(struct platform_device *pdev)
 {
-        struct mmc_host *mmc = dev_get_drvdata(dev);
+        struct mmc_host *mmc = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (mmc) {
                 struct pxamci_host *host = mmc_priv(mmc);
 
                 if (host->pdata && host->pdata->exit)
-                        host->pdata->exit(dev, mmc);
+                        host->pdata->exit(&pdev->dev, mmc);
 
                 mmc_remove_host(mmc);
 
@@ -560,7 +559,7 @@ static int pxamci_remove(struct device *dev)
                 free_irq(host->irq, host);
                 pxa_free_dma(host->dma);
                 iounmap(host->base);
-                dma_free_coherent(dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
+                dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
 
                 release_resource(host->res);
 
@@ -570,9 +569,9 @@ static int pxamci_remove(struct device *dev)
 }
 
 #ifdef CONFIG_PM
-static int pxamci_suspend(struct device *dev, pm_message_t state)
+static int pxamci_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct mmc_host *mmc = dev_get_drvdata(dev);
+        struct mmc_host *mmc = platform_get_drvdata(dev);
         int ret = 0;
 
         if (mmc)
@@ -581,9 +580,9 @@ static int pxamci_suspend(struct device *dev, pm_message_t state)
         return ret;
 }
 
-static int pxamci_resume(struct device *dev)
+static int pxamci_resume(struct platform_device *dev)
 {
-        struct mmc_host *mmc = dev_get_drvdata(dev);
+        struct mmc_host *mmc = platform_get_drvdata(dev);
         int ret = 0;
 
         if (mmc)
@@ -596,23 +595,24 @@ static int pxamci_resume(struct device *dev)
 #define pxamci_resume   NULL
 #endif
 
-static struct device_driver pxamci_driver = {
-        .name           = DRIVER_NAME,
-        .bus            = &platform_bus_type,
+static struct platform_driver pxamci_driver = {
         .probe          = pxamci_probe,
         .remove         = pxamci_remove,
         .suspend        = pxamci_suspend,
         .resume         = pxamci_resume,
+        .driver         = {
+                .name   = DRIVER_NAME,
+        },
 };
 
 static int __init pxamci_init(void)
 {
-        return driver_register(&pxamci_driver);
+        return platform_driver_register(&pxamci_driver);
 }
 
 static void __exit pxamci_exit(void)
 {
-        driver_unregister(&pxamci_driver);
+        platform_driver_unregister(&pxamci_driver);
 }
 
 module_init(pxamci_init);
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index e954b8354fef..c7eb7c269081 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -42,7 +42,7 @@
 #include "wbsd.h"
 
 #define DRIVER_NAME "wbsd"
-#define DRIVER_VERSION "1.4"
+#define DRIVER_VERSION "1.5"
 
 #ifdef CONFIG_MMC_DEBUG
 #define DBG(x...) \
@@ -1932,14 +1932,14 @@ static void __devexit wbsd_shutdown(struct device* dev, int pnp)
  * Non-PnP
  */
 
-static int __devinit wbsd_probe(struct device* dev)
+static int __devinit wbsd_probe(struct platform_device* dev)
 {
-        return wbsd_init(dev, io, irq, dma, 0);
+        return wbsd_init(&dev->dev, io, irq, dma, 0);
 }
 
-static int __devexit wbsd_remove(struct device* dev)
+static int __devexit wbsd_remove(struct platform_device* dev)
 {
-        wbsd_shutdown(dev, 0);
+        wbsd_shutdown(&dev->dev, 0);
 
         return 0;
 }
@@ -1983,9 +1983,9 @@ static void __devexit wbsd_pnp_remove(struct pnp_dev * dev)
 
 #ifdef CONFIG_PM
 
-static int wbsd_suspend(struct device *dev, pm_message_t state)
+static int wbsd_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct mmc_host *mmc = dev_get_drvdata(dev);
+        struct mmc_host *mmc = platform_get_drvdata(dev);
         struct wbsd_host *host;
         int ret;
 
@@ -2005,9 +2005,9 @@ static int wbsd_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int wbsd_resume(struct device *dev)
+static int wbsd_resume(struct platform_device *dev)
 {
-        struct mmc_host *mmc = dev_get_drvdata(dev);
+        struct mmc_host *mmc = platform_get_drvdata(dev);
         struct wbsd_host *host;
 
         if (!mmc)
@@ -2038,14 +2038,15 @@ static int wbsd_resume(struct device *dev)
 
 static struct platform_device *wbsd_device;
 
-static struct device_driver wbsd_driver = {
-        .name           = DRIVER_NAME,
-        .bus            = &platform_bus_type,
+static struct platform_driver wbsd_driver = {
         .probe          = wbsd_probe,
-        .remove         = wbsd_remove,
+        .remove         = __devexit_p(wbsd_remove),
 
         .suspend        = wbsd_suspend,
         .resume         = wbsd_resume,
+        .driver         = {
+                .name   = DRIVER_NAME,
+        },
 };
 
 #ifdef CONFIG_PNP
@@ -2054,7 +2055,7 @@ static struct pnp_driver wbsd_pnp_driver = {
         .name           = DRIVER_NAME,
         .id_table       = pnp_dev_table,
         .probe          = wbsd_pnp_probe,
-        .remove         = wbsd_pnp_remove,
+        .remove         = __devexit_p(wbsd_pnp_remove),
 };
 
 #endif /* CONFIG_PNP */
@@ -2085,7 +2086,7 @@ static int __init wbsd_drv_init(void)
 
         if (nopnp)
         {
-                result = driver_register(&wbsd_driver);
+                result = platform_driver_register(&wbsd_driver);
                 if (result < 0)
                         return result;
 
@@ -2111,7 +2112,7 @@ static void __exit wbsd_drv_exit(void)
         {
                 platform_device_unregister(wbsd_device);
 
-                driver_unregister(&wbsd_driver);
+                platform_driver_unregister(&wbsd_driver);
         }
 
         DBG("unloaded\n");
@@ -2127,6 +2128,7 @@ module_param(irq, uint, 0444);
 module_param(dma, int, 0444);
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>");
 MODULE_DESCRIPTION("Winbond W83L51xD SD/MMC card interface driver");
 MODULE_VERSION(DRIVER_VERSION);
 
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index b7858eb93534..51f962dd7e31 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -63,11 +63,6 @@ struct bast_flash_info {
 
 static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
 
-static struct bast_flash_info *to_bast_info(struct device *dev)
-{
-        return (struct bast_flash_info *)dev_get_drvdata(dev);
-}
-
 static void bast_flash_setrw(int to)
 {
         unsigned int val;
@@ -87,11 +82,11 @@ static void bast_flash_setrw(int to)
         local_irq_restore(flags);
 }
 
-static int bast_flash_remove(struct device *dev)
+static int bast_flash_remove(struct platform_device *pdev)
 {
-        struct bast_flash_info *info = to_bast_info(dev);
+        struct bast_flash_info *info = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (info == NULL)
                 return 0;
@@ -116,9 +111,8 @@ static int bast_flash_remove(struct device *dev)
         return 0;
 }
 
-static int bast_flash_probe(struct device *dev)
+static int bast_flash_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct bast_flash_info *info;
         struct resource *res;
         int err = 0;
@@ -131,13 +125,13 @@ static int bast_flash_probe(struct device *dev)
         }
 
         memzero(info, sizeof(*info));
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
         res = pdev->resource;  /* assume that the flash has one resource */
 
         info->map.phys = res->start;
         info->map.size = res->end - res->start + 1;
-        info->map.name = dev->bus_id;
+        info->map.name = pdev->dev.bus_id;      
         info->map.bankwidth = 2;
 
         if (info->map.size > AREA_MAXSIZE)
@@ -199,27 +193,28 @@ static int bast_flash_probe(struct device *dev)
         /* fall through to exit error */
 
  exit_error:
-        bast_flash_remove(dev);
+        bast_flash_remove(pdev);
         return err;
 }
 
-static struct device_driver bast_flash_driver = {
-        .name           = "bast-nor",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver bast_flash_driver = {
         .probe          = bast_flash_probe,
         .remove         = bast_flash_remove,
+        .driver         = {
+                .name   = "bast-nor",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init bast_flash_init(void)
 {
         printk("BAST NOR-Flash Driver, (c) 2004 Simtec Electronics\n");
-        return driver_register(&bast_flash_driver);
+        return platform_driver_register(&bast_flash_driver);
 }
 
 static void __exit bast_flash_exit(void)
 {
-        driver_unregister(&bast_flash_driver);
+        platform_driver_unregister(&bast_flash_driver);
 }
 
 module_init(bast_flash_init);
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index fe738fd8d6f8..a3ba52fbd868 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -67,9 +67,8 @@ static void armflash_set_vpp(struct map_info *map, int on)
 
 static const char *probes[] = { "cmdlinepart", "RedBoot", "afs", NULL };
 
-static int armflash_probe(struct device *_dev)
+static int armflash_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
         struct resource *res = dev->resource;
         unsigned int size = res->end - res->start + 1;
@@ -138,7 +137,7 @@ static int armflash_probe(struct device *_dev)
         }
 
         if (err == 0)
-                dev_set_drvdata(&dev->dev, info);
+                platform_set_drvdata(dev, info);
 
         /*
          * If we got an error, free all resources.
@@ -163,12 +162,11 @@ static int armflash_probe(struct device *_dev)
         return err;
 }
 
-static int armflash_remove(struct device *_dev)
+static int armflash_remove(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
-        struct armflash_info *info = dev_get_drvdata(&dev->dev);
+        struct armflash_info *info = platform_get_drvdata(dev);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if (info) {
                 if (info->mtd) {
@@ -190,21 +188,22 @@ static int armflash_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver armflash_driver = {
-        .name           = "armflash",
-        .bus            = &platform_bus_type,
+static struct platform_driver armflash_driver = {
         .probe          = armflash_probe,
         .remove         = armflash_remove,
+        .driver         = {
+                .name   = "armflash",
+        },
 };
 
 static int __init armflash_init(void)
 {
-        return driver_register(&armflash_driver);
+        return platform_driver_register(&armflash_driver);
 }
 
 static void __exit armflash_exit(void)
 {
-        driver_unregister(&armflash_driver);
+        platform_driver_unregister(&armflash_driver);
 }
 
 module_init(armflash_init);
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index 641eb2b55e9f..fc7a78e31735 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -111,13 +111,12 @@ static void ixp2000_flash_copy_to(struct map_info *map, unsigned long to,
 }
 
 
-static int ixp2000_flash_remove(struct device *_dev)
+static int ixp2000_flash_remove(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
-        struct ixp2000_flash_info *info = dev_get_drvdata(&dev->dev);
+        struct ixp2000_flash_info *info = platform_get_drvdata(dev);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if(!info)
                 return 0;
@@ -143,10 +142,9 @@ static int ixp2000_flash_remove(struct device *_dev)
 }
 
 
-static int ixp2000_flash_probe(struct device *_dev)
+static int ixp2000_flash_probe(struct platform_device *dev)
 {
         static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
-        struct platform_device *dev = to_platform_device(_dev);
         struct ixp2000_flash_data *ixp_data = dev->dev.platform_data;
         struct flash_platform_data *plat;
         struct ixp2000_flash_info *info;
@@ -177,7 +175,7 @@ static int ixp2000_flash_probe(struct device *_dev)
         }
         memzero(info, sizeof(struct ixp2000_flash_info));
 
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         /*
          * Tell the MTD layer we're not 1:1 mapped so that it does
@@ -248,25 +246,26 @@ static int ixp2000_flash_probe(struct device *_dev)
         return 0;
 
 Error:
-        ixp2000_flash_remove(_dev);
+        ixp2000_flash_remove(dev);
         return err;
 }
 
-static struct device_driver ixp2000_flash_driver = {
-        .name           = "IXP2000-Flash",
-        .bus            = &platform_bus_type,
+static struct platform_driver ixp2000_flash_driver = {
         .probe          = &ixp2000_flash_probe,
         .remove         = &ixp2000_flash_remove
+        .driver         = {
+                .name   = "IXP2000-Flash",
+        },
 };
 
 static int __init ixp2000_flash_init(void)
 {
-        return driver_register(&ixp2000_flash_driver);
+        return platform_driver_register(&ixp2000_flash_driver);
 }
 
 static void __exit ixp2000_flash_exit(void)
 {
-        driver_unregister(&ixp2000_flash_driver);
+        platform_driver_unregister(&ixp2000_flash_driver);
 }
 
 module_init(ixp2000_flash_init);
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 56b3a355bf7b..a59f8027903c 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -99,13 +99,12 @@ struct ixp4xx_flash_info {
 
 static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
 
-static int ixp4xx_flash_remove(struct device *_dev)
+static int ixp4xx_flash_remove(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
-        struct ixp4xx_flash_info *info = dev_get_drvdata(&dev->dev);
+        struct ixp4xx_flash_info *info = platform_get_drvdata(dev);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if(!info)
                 return 0;
@@ -130,9 +129,8 @@ static int ixp4xx_flash_remove(struct device *_dev)
         return 0;
 }
 
-static int ixp4xx_flash_probe(struct device *_dev)
+static int ixp4xx_flash_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
         struct ixp4xx_flash_info *info;
         int err = -1;
@@ -153,7 +151,7 @@ static int ixp4xx_flash_probe(struct device *_dev)
         }
         memzero(info, sizeof(struct ixp4xx_flash_info));
 
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         /*
          * Tell the MTD layer we're not 1:1 mapped so that it does
@@ -214,25 +212,26 @@ static int ixp4xx_flash_probe(struct device *_dev)
         return 0;
 
 Error:
-        ixp4xx_flash_remove(_dev);
+        ixp4xx_flash_remove(dev);
         return err;
 }
 
-static struct device_driver ixp4xx_flash_driver = {
-        .name           = "IXP4XX-Flash",
-        .bus            = &platform_bus_type,
+static struct platform_driver ixp4xx_flash_driver = {
         .probe          = ixp4xx_flash_probe,
         .remove         = ixp4xx_flash_remove,
+        .driver         = {
+                .name   = "IXP4XX-Flash",
+        },
 };
 
 static int __init ixp4xx_flash_init(void)
 {
-        return driver_register(&ixp4xx_flash_driver);
+        return platform_driver_register(&ixp4xx_flash_driver);
 }
 
 static void __exit ixp4xx_flash_exit(void)
 {
-        driver_unregister(&ixp4xx_flash_driver);
+        platform_driver_unregister(&ixp4xx_flash_driver);
 }
 
 
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index fd3b4a5fc207..418afffb2d80 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -70,11 +70,10 @@ static void omap_set_vpp(struct map_info *map, int enable)
         }
 }
 
-static int __devinit omapflash_probe(struct device *dev)
+static int __devinit omapflash_probe(struct platform_device *pdev)
 {
         int err;
         struct omapflash_info *info;
-        struct platform_device *pdev = to_platform_device(dev);
         struct flash_platform_data *pdata = pdev->dev.platform_data;
         struct resource *res = pdev->resource;
         unsigned long size = res->end - res->start + 1;
@@ -119,7 +118,7 @@ static int __devinit omapflash_probe(struct device *dev)
 #endif
                 add_mtd_device(info->mtd);
 
-        dev_set_drvdata(&pdev->dev, info);
+        platform_set_drvdata(pdev, info);
 
         return 0;
 
@@ -133,12 +132,11 @@ out_free_info:
         return err;
 }
 
-static int __devexit omapflash_remove(struct device *dev)
+static int __devexit omapflash_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct omapflash_info *info = dev_get_drvdata(&pdev->dev);
+        struct omapflash_info *info = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(&pdev->dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (info) {
                 if (info->parts) {
@@ -155,21 +153,22 @@ static int __devexit omapflash_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver omapflash_driver = {
-        .name   = "omapflash",
-        .bus    = &platform_bus_type,
+static struct platform_driver omapflash_driver = {
         .probe  = omapflash_probe,
         .remove = __devexit_p(omapflash_remove),
+        .driver = {
+                .name   = "omapflash",
+        },
 };
 
 static int __init omapflash_init(void)
 {
-        return driver_register(&omapflash_driver);
+        return platform_driver_register(&omapflash_driver);
 }
 
 static void __exit omapflash_exit(void)
 {
-        driver_unregister(&omapflash_driver);
+        platform_driver_unregister(&omapflash_driver);
 }
 
 module_init(omapflash_init);
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index a02eed94a231..5d3c75451ca2 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -56,9 +56,9 @@ struct platram_info {
  * device private data to struct platram_info conversion
 */
 
-static inline struct platram_info *to_platram_info(struct device *dev)
+static inline struct platram_info *to_platram_info(struct platform_device *dev)
 {
-        return (struct platram_info *)dev_get_drvdata(dev);
+        return (struct platram_info *)platform_get_drvdata(dev);
 }
 
 /* platram_setrw
@@ -83,13 +83,13 @@ static inline void platram_setrw(struct platram_info *info, int to)
  * called to remove the device from the driver's control
 */
 
-static int platram_remove(struct device *dev)
+static int platram_remove(struct platform_device *pdev)
 {
-        struct platram_info *info = to_platram_info(dev);
+        struct platram_info *info = to_platram_info(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
-        dev_dbg(dev, "removing device\n");
+        dev_dbg(&pdev->dev, "removing device\n");
 
         if (info == NULL)
                 return 0;
@@ -130,61 +130,60 @@ static int platram_remove(struct device *dev)
  * driver is found.
 */
 
-static int platram_probe(struct device *dev)
+static int platram_probe(struct platform_device *pdev)
 {
-        struct platform_device *pd = to_platform_device(dev);
         struct platdata_mtd_ram *pdata;
         struct platram_info *info;
         struct resource *res;
         int err = 0;
 
-        dev_dbg(dev, "probe entered\n");
+        dev_dbg(&pdev->dev, "probe entered\n");
 
-        if (dev->platform_data == NULL) {
-                dev_err(dev, "no platform data supplied\n");
+        if (pdev->dev.platform_data == NULL) {
+                dev_err(&pdev->dev, "no platform data supplied\n");
                 err = -ENOENT;
                 goto exit_error;
         }
 
-        pdata = dev->platform_data;
+        pdata = pdev->dev.platform_data;
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
-                dev_err(dev, "no memory for flash info\n");
+                dev_err(&pdev->dev, "no memory for flash info\n");
                 err = -ENOMEM;
                 goto exit_error;
         }
 
         memset(info, 0, sizeof(*info));
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
-        info->dev = dev;
+        info->dev = &pdev->dev;
         info->pdata = pdata;
 
         /* get the resource for the memory mapping */
 
-        res = platform_get_resource(pd, IORESOURCE_MEM, 0);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         if (res == NULL) {
-                dev_err(dev, "no memory resource specified\n");
+                dev_err(&pdev->dev, "no memory resource specified\n");
                 err = -ENOENT;
                 goto exit_free;
         }
 
-        dev_dbg(dev, "got platform resource %p (0x%lx)\n", res, res->start);
+        dev_dbg(&pdev->dev, "got platform resource %p (0x%lx)\n", res, res->start);
 
         /* setup map parameters */
 
         info->map.phys = res->start;
         info->map.size = (res->end - res->start) + 1;
-        info->map.name = pdata->mapname != NULL ? pdata->mapname : (char *)pd->name;
+        info->map.name = pdata->mapname != NULL ? pdata->mapname : (char *)pdev->name;
         info->map.bankwidth = pdata->bankwidth;
 
         /* register our usage of the memory area */
 
-        info->area = request_mem_region(res->start, info->map.size, pd->name);
+        info->area = request_mem_region(res->start, info->map.size, pdev->name);
         if (info->area == NULL) {
-                dev_err(dev, "failed to request memory region\n");
+                dev_err(&pdev->dev, "failed to request memory region\n");
                 err = -EIO;
                 goto exit_free;
         }
@@ -192,23 +191,23 @@ static int platram_probe(struct device *dev)
         /* remap the memory area */
 
         info->map.virt = ioremap(res->start, info->map.size);
-        dev_dbg(dev, "virt %p, %lu bytes\n", info->map.virt, info->map.size);
+        dev_dbg(&pdev->dev, "virt %p, %lu bytes\n", info->map.virt, info->map.size);
 
         if (info->map.virt == NULL) {
-                dev_err(dev, "failed to ioremap() region\n");
+                dev_err(&pdev->dev, "failed to ioremap() region\n");
                 err = -EIO;
                 goto exit_free;
         }
 
         simple_map_init(&info->map);
 
-        dev_dbg(dev, "initialised map, probing for mtd\n");
+        dev_dbg(&pdev->dev, "initialised map, probing for mtd\n");
 
         /* probe for the right mtd map driver */
 
         info->mtd = do_map_probe("map_ram" , &info->map);
         if (info->mtd == NULL) {
-                dev_err(dev, "failed to probe for map_ram\n");
+                dev_err(&pdev->dev, "failed to probe for map_ram\n");
                 err = -ENOMEM;
                 goto exit_free;
         }
@@ -237,27 +236,28 @@ static int platram_probe(struct device *dev)
 #endif /* CONFIG_MTD_PARTITIONS */
 
         if (add_mtd_device(info->mtd)) {
-                dev_err(dev, "add_mtd_device() failed\n");
+                dev_err(&pdev->dev, "add_mtd_device() failed\n");
                 err = -ENOMEM;
         }
 
-        dev_info(dev, "registered mtd device\n");
+        dev_info(&pdev->dev, "registered mtd device\n");
         return err;
 
  exit_free:
-        platram_remove(dev);
+        platram_remove(pdev);
  exit_error:
         return err;
 }
 
 /* device driver info */
 
-static struct device_driver platram_driver = {
-        .name           = "mtd-ram",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver platram_driver = {
         .probe          = platram_probe,
         .remove         = platram_remove,
+        .driver         = {
+                .name   = "mtd-ram",
+                .owner  = THIS_MODULE,
+        },
 };
 
 /* module init/exit */
@@ -265,12 +265,12 @@ static struct device_driver platram_driver = {
 static int __init platram_init(void)
 {
         printk("Generic platform RAM MTD, (c) 2004 Simtec Electronics\n");
-        return driver_register(&platram_driver);
+        return platform_driver_register(&platram_driver);
 }
 
 static void __exit platram_exit(void)
 {
-        driver_unregister(&platram_driver);
+        platform_driver_unregister(&platram_driver);
 }
 
 module_init(platram_init);
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 9e8bb1782be0..5cefb015633c 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -356,9 +356,8 @@ sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
 
 static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
 
-static int __init sa1100_mtd_probe(struct device *dev)
+static int __init sa1100_mtd_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct flash_platform_data *plat = pdev->dev.platform_data;
         struct mtd_partition *parts;
         const char *part_type = NULL;
@@ -402,28 +401,28 @@ static int __init sa1100_mtd_probe(struct device *dev)
 
         info->nr_parts = nr_parts;
 
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
         err = 0;
 
  out:
         return err;
 }
 
-static int __exit sa1100_mtd_remove(struct device *dev)
+static int __exit sa1100_mtd_remove(struct platform_device *pdev)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
-        struct flash_platform_data *plat = dev->platform_data;
+        struct sa_info *info = platform_get_drvdata(pdev);
+        struct flash_platform_data *plat = pdev->dev.platform_data;
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         sa1100_destroy(info, plat);
 
         return 0;
 }
 
 #ifdef CONFIG_PM
-static int sa1100_mtd_suspend(struct device *dev, pm_message_t state)
+static int sa1100_mtd_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
+        struct sa_info *info = platform_get_drvdata(dev);
         int ret = 0;
 
         if (info)
@@ -432,17 +431,17 @@ static int sa1100_mtd_suspend(struct device *dev, pm_message_t state)
         return ret;
 }
 
-static int sa1100_mtd_resume(struct device *dev)
+static int sa1100_mtd_resume(struct platform_device *dev)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
+        struct sa_info *info = platform_get_drvdata(dev);
         if (info)
                 info->mtd->resume(info->mtd);
         return 0;
 }
 
-static void sa1100_mtd_shutdown(struct device *dev)
+static void sa1100_mtd_shutdown(struct platform_device *dev)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
+        struct sa_info *info = platform_get_drvdata(dev);
         if (info && info->mtd->suspend(info->mtd) == 0)
                 info->mtd->resume(info->mtd);
 }
@@ -452,24 +451,25 @@ static void sa1100_mtd_shutdown(struct device *dev)
 #define sa1100_mtd_shutdown NULL
 #endif
 
-static struct device_driver sa1100_mtd_driver = {
-        .name           = "flash",
-        .bus            = &platform_bus_type,
+static struct platform_driver sa1100_mtd_driver = {
         .probe          = sa1100_mtd_probe,
         .remove         = __exit_p(sa1100_mtd_remove),
         .suspend        = sa1100_mtd_suspend,
         .resume         = sa1100_mtd_resume,
         .shutdown       = sa1100_mtd_shutdown,
+        .driver         = {
+                .name   = "flash",
+        },
 };
 
 static int __init sa1100_mtd_init(void)
 {
-        return driver_register(&sa1100_mtd_driver);
+        return platform_driver_register(&sa1100_mtd_driver);
 }
 
 static void __exit sa1100_mtd_exit(void)
 {
-        driver_unregister(&sa1100_mtd_driver);
+        platform_driver_unregister(&sa1100_mtd_driver);
 }
 
 module_init(sa1100_mtd_init);
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 97e9b7892d29..d209214b1318 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -125,14 +125,14 @@ static struct s3c2410_nand_info *s3c2410_nand_mtd_toinfo(struct mtd_info *mtd)
         return s3c2410_nand_mtd_toours(mtd)->info;
 }
 
-static struct s3c2410_nand_info *to_nand_info(struct device *dev)
+static struct s3c2410_nand_info *to_nand_info(struct platform_device *dev)
 {
-        return dev_get_drvdata(dev);
+        return platform_get_drvdata(dev);
 }
 
-static struct s3c2410_platform_nand *to_nand_plat(struct device *dev)
+static struct s3c2410_platform_nand *to_nand_plat(struct platform_device *dev)
 {
-        return dev->platform_data;
+        return dev->dev.platform_data;
 }
 
 /* timing calculations */
@@ -165,9 +165,9 @@ static int s3c2410_nand_calc_rate(int wanted, unsigned long clk, int max)
 /* controller setup */
 
 static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,
-                               struct device *dev)
+                               struct platform_device *pdev)
 {
-        struct s3c2410_platform_nand *plat = to_nand_plat(dev);
+        struct s3c2410_platform_nand *plat = to_nand_plat(pdev);
         unsigned long clkrate = clk_get_rate(info->clk);
         int tacls, twrph0, twrph1;
         unsigned long cfg;
@@ -430,11 +430,11 @@ static void s3c2410_nand_write_buf(struct mtd_info *mtd,
 
 /* device management functions */
 
-static int s3c2410_nand_remove(struct device *dev)
+static int s3c2410_nand_remove(struct platform_device *pdev)
 {
-        struct s3c2410_nand_info *info = to_nand_info(dev);
+        struct s3c2410_nand_info *info = to_nand_info(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (info == NULL)
                 return 0;
@@ -562,10 +562,9 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
  * nand layer to look for devices
 */
 
-static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
+static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct s3c2410_platform_nand *plat = to_nand_plat(dev);
+        struct s3c2410_platform_nand *plat = to_nand_plat(pdev);
         struct s3c2410_nand_info *info;
         struct s3c2410_nand_mtd *nmtd;
         struct s3c2410_nand_set *sets;
@@ -575,26 +574,26 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         int nr_sets;
         int setno;
 
-        pr_debug("s3c2410_nand_probe(%p)\n", dev);
+        pr_debug("s3c2410_nand_probe(%p)\n", pdev);
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
-                dev_err(dev, "no memory for flash info\n");
+                dev_err(&pdev->dev, "no memory for flash info\n");
                 err = -ENOMEM;
                 goto exit_error;
         }
 
         memzero(info, sizeof(*info));
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
         spin_lock_init(&info->controller.lock);
         init_waitqueue_head(&info->controller.wq);
 
         /* get the clock source and enable it */
 
-        info->clk = clk_get(dev, "nand");
+        info->clk = clk_get(&pdev->dev, "nand");
         if (IS_ERR(info->clk)) {
-                dev_err(dev, "failed to get clock");
+                dev_err(&pdev->dev, "failed to get clock");
                 err = -ENOENT;
                 goto exit_error;
         }
@@ -611,27 +610,27 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         info->area = request_mem_region(res->start, size, pdev->name);
 
         if (info->area == NULL) {
-                dev_err(dev, "cannot reserve register region\n");
+                dev_err(&pdev->dev, "cannot reserve register region\n");
                 err = -ENOENT;
                 goto exit_error;
         }
 
-        info->device     = dev;
+        info->device     = &pdev->dev;
         info->platform   = plat;
         info->regs       = ioremap(res->start, size);
         info->is_s3c2440 = is_s3c2440;
 
         if (info->regs == NULL) {
-                dev_err(dev, "cannot reserve register region\n");
+                dev_err(&pdev->dev, "cannot reserve register region\n");
                 err = -EIO;
                 goto exit_error;
         }
 
-        dev_dbg(dev, "mapped registers at %p\n", info->regs);
+        dev_dbg(&pdev->dev, "mapped registers at %p\n", info->regs);
 
         /* initialise the hardware */
 
-        err = s3c2410_nand_inithw(info, dev);
+        err = s3c2410_nand_inithw(info, pdev);
         if (err != 0)
                 goto exit_error;
 
@@ -645,7 +644,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         size = nr_sets * sizeof(*info->mtds);
         info->mtds = kmalloc(size, GFP_KERNEL);
         if (info->mtds == NULL) {
-                dev_err(dev, "failed to allocate mtd storage\n");
+                dev_err(&pdev->dev, "failed to allocate mtd storage\n");
                 err = -ENOMEM;
                 goto exit_error;
         }
@@ -677,7 +676,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         return 0;
 
  exit_error:
-        s3c2410_nand_remove(dev);
+        s3c2410_nand_remove(pdev);
 
         if (err == 0)
                 err = -EINVAL;
@@ -686,44 +685,46 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
 
 /* driver device registration */
 
-static int s3c2410_nand_probe(struct device *dev)
+static int s3c2410_nand_probe(struct platform_device *dev)
 {
         return s3c24xx_nand_probe(dev, 0);
 }
 
-static int s3c2440_nand_probe(struct device *dev)
+static int s3c2440_nand_probe(struct platform_device *dev)
 {
         return s3c24xx_nand_probe(dev, 1);
 }
 
-static struct device_driver s3c2410_nand_driver = {
-        .name           = "s3c2410-nand",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410_nand_driver = {
         .probe          = s3c2410_nand_probe,
         .remove         = s3c2410_nand_remove,
+        .driver         = {
+                .name   = "s3c2410-nand",
+                .owner  = THIS_MODULE,
+        },
 };
 
-static struct device_driver s3c2440_nand_driver = {
-        .name           = "s3c2440-nand",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2440_nand_driver = {
         .probe          = s3c2440_nand_probe,
         .remove         = s3c2410_nand_remove,
+        .driver         = {
+                .name   = "s3c2440-nand",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init s3c2410_nand_init(void)
 {
         printk("S3C24XX NAND Driver, (c) 2004 Simtec Electronics\n");
 
-        driver_register(&s3c2440_nand_driver);
-        return driver_register(&s3c2410_nand_driver);
+        platform_driver_register(&s3c2440_nand_driver);
+        return platform_driver_register(&s3c2410_nand_driver);
 }
 
 static void __exit s3c2410_nand_exit(void)
 {
-        driver_unregister(&s3c2440_nand_driver);
-        driver_unregister(&s3c2410_nand_driver);
+        platform_driver_unregister(&s3c2440_nand_driver);
+        platform_driver_unregister(&s3c2410_nand_driver);
 }
 
 module_init(s3c2410_nand_init);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5c69d57f8548..ebd7313d7fc1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -812,7 +812,7 @@ config SMC91X
         tristate "SMC 91C9x/91C1xxx support"
         select CRC32
         select MII
-        depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH)
+        depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00)
         help
           This is a driver for SMC's 91x series of Ethernet chipsets,
           including the SMC91C94 and the SMC91C111. Say Y if you want it
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 8f464271664d..49fa1e4413fa 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -2707,7 +2707,7 @@ bnx2_init_nvram(struct bnx2 *bp)
 
         if (j == entry_count) {
                 bp->flash_info = NULL;
-                printk(KERN_ALERT "Unknown flash/EEPROM type.\n");
+                printk(KERN_ALERT PFX "Unknown flash/EEPROM type.\n");
                 rc = -ENODEV;
         }
 
@@ -3903,6 +3903,8 @@ bnx2_test_loopback(struct bnx2 *bp)
 
         pkt_size = 1514;
         skb = dev_alloc_skb(pkt_size);
+        if (!skb)
+                return -ENOMEM;
         packet = skb_put(skb, pkt_size);
         memcpy(packet, bp->mac_addr, 6);
         memset(packet + 6, 0x0, 8);
@@ -4798,11 +4800,7 @@ bnx2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
         struct bnx2 *bp = dev->priv;
         int rc;
 
-        if (eeprom->offset > bp->flash_info->total_size)
-                return -EINVAL;
-
-        if ((eeprom->offset + eeprom->len) > bp->flash_info->total_size)
-                eeprom->len = bp->flash_info->total_size - eeprom->offset;
+        /* parameters already validated in ethtool_get_eeprom */
 
         rc = bnx2_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
 
@@ -4816,11 +4814,7 @@ bnx2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
         struct bnx2 *bp = dev->priv;
         int rc;
 
-        if (eeprom->offset > bp->flash_info->total_size)
-                return -EINVAL;
-
-        if ((eeprom->offset + eeprom->len) > bp->flash_info->total_size)
-                eeprom->len = bp->flash_info->total_size - eeprom->offset;
+        /* parameters already validated in ethtool_set_eeprom */
 
         rc = bnx2_nvram_write(bp, eeprom->offset, eebuf, eeprom->len);
 
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 0d33a93df96b..03804cc38be0 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -398,13 +398,19 @@ static struct mca_driver depca_mca_driver = {
 };
 #endif
 
-static int depca_isa_probe (struct device *);
+static int depca_isa_probe (struct platform_device *);
 
-static struct device_driver depca_isa_driver = {
-        .name   = depca_string,
-        .bus    = &platform_bus_type,
+static int __devexit depca_isa_remove(struct platform_device *pdev)
+{
+        return depca_device_remove(&pdev->dev);
+}
+
+static struct platform_driver depca_isa_driver = {
         .probe  = depca_isa_probe,
-        .remove = __devexit_p(depca_device_remove),
+        .remove = __devexit_p(depca_isa_remove),
+        .driver = {
+                .name   = depca_string,
+        },
 };
         
 /*
@@ -1525,7 +1531,7 @@ static enum depca_type __init depca_shmem_probe (ulong *mem_start)
         return adapter;
 }
 
-static int __init depca_isa_probe (struct device *device)
+static int __init depca_isa_probe (struct platform_device *device)
 {
         struct net_device *dev;
         struct depca_private *lp;
@@ -1533,7 +1539,7 @@ static int __init depca_isa_probe (struct device *device)
         enum depca_type adapter = unknown;
         int status = 0;
 
-        ioaddr = (u_long) device->platform_data;
+        ioaddr = (u_long) device->dev.platform_data;
 
         if ((status = depca_common_init (ioaddr, &dev)))
                 goto out;
@@ -1553,7 +1559,7 @@ static int __init depca_isa_probe (struct device *device)
         lp->adapter = adapter;
         lp->mem_start = mem_start;
         
-        if ((status = depca_hw_init(dev, device)))
+        if ((status = depca_hw_init(dev, &device->dev)))
                 goto out_free;
         
         return 0;
@@ -2082,7 +2088,7 @@ static int __init depca_module_init (void)
 #ifdef CONFIG_EISA
         err |= eisa_driver_register (&depca_eisa_driver);
 #endif
-        err |= driver_register (&depca_isa_driver);
+        err |= platform_driver_register (&depca_isa_driver);
         depca_platform_probe ();
         
         return err;
@@ -2097,7 +2103,7 @@ static void __exit depca_module_exit (void)
 #ifdef CONFIG_EISA
         eisa_driver_unregister (&depca_eisa_driver);
 #endif
-        driver_unregister (&depca_isa_driver);
+        platform_driver_unregister (&depca_isa_driver);
 
         for (i = 0; depca_io_ports[i].iobase; i++) {
                 if (depca_io_ports[i].device) {
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index f8c9bcdab68b..24996da4c1c4 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -148,7 +148,7 @@ typedef struct board_info {
 } board_info_t;
 
 /* function declaration ------------------------------------- */
-static int dm9000_probe(struct device *);
+static int dm9000_probe(struct platform_device *);
 static int dm9000_open(struct net_device *);
 static int dm9000_start_xmit(struct sk_buff *, struct net_device *);
 static int dm9000_stop(struct net_device *);
@@ -378,9 +378,8 @@ dm9000_release_board(struct platform_device *pdev, struct board_info *db)
  * Search DM9000 board, allocate space and register it
  */
 static int
-dm9000_probe(struct device *dev)
+dm9000_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct dm9000_plat_data *pdata = pdev->dev.platform_data;
         struct board_info *db;  /* Point a board information structure */
         struct net_device *ndev;
@@ -398,7 +397,7 @@ dm9000_probe(struct device *dev)
         }
 
         SET_MODULE_OWNER(ndev);
-        SET_NETDEV_DEV(ndev, dev);
+        SET_NETDEV_DEV(ndev, &pdev->dev);
 
         PRINTK2("dm9000_probe()");
 
@@ -569,7 +568,7 @@ dm9000_probe(struct device *dev)
                 printk("%s: Invalid ethernet MAC address.  Please "
                        "set using ifconfig\n", ndev->name);
 
-        dev_set_drvdata(dev, ndev);
+        platform_set_drvdata(pdev, ndev);
         ret = register_netdev(ndev);
 
         if (ret == 0) {
@@ -1140,9 +1139,9 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
 }
 
 static int
-dm9000_drv_suspend(struct device *dev, pm_message_t state)
+dm9000_drv_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(dev);
 
         if (ndev) {
                 if (netif_running(ndev)) {
@@ -1154,9 +1153,9 @@ dm9000_drv_suspend(struct device *dev, pm_message_t state)
 }
 
 static int
-dm9000_drv_resume(struct device *dev)
+dm9000_drv_resume(struct platform_device *dev)
 {
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(dev);
         board_info_t *db = (board_info_t *) ndev->priv;
 
         if (ndev) {
@@ -1172,12 +1171,11 @@ dm9000_drv_resume(struct device *dev)
 }
 
 static int
-dm9000_drv_remove(struct device *dev)
+dm9000_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         unregister_netdev(ndev);
         dm9000_release_board(pdev, (board_info_t *) ndev->priv);
@@ -1188,13 +1186,14 @@ dm9000_drv_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver dm9000_driver = {
-        .name    = "dm9000",
-        .bus     = &platform_bus_type,
+static struct platform_driver dm9000_driver = {
         .probe   = dm9000_probe,
         .remove  = dm9000_drv_remove,
         .suspend = dm9000_drv_suspend,
         .resume  = dm9000_drv_resume,
+        .driver = {
+                .name   = "dm9000",
+        },
 };
 
 static int __init
@@ -1202,13 +1201,13 @@ dm9000_init(void)
 {
         printk(KERN_INFO "%s Ethernet Driver\n", CARDNAME);
 
-        return driver_register(&dm9000_driver); /* search board and register */
+        return platform_driver_register(&dm9000_driver);        /* search board and register */
 }
 
 static void __exit
 dm9000_cleanup(void)
 {
-        driver_unregister(&dm9000_driver);
+        platform_driver_unregister(&dm9000_driver);
 }
 
 module_init(dm9000_init);
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 22aec6ed80f5..525624fc03b4 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -80,7 +80,7 @@
  *                         into nv_close, otherwise reenabling for wol can
  *                         cause DMA to kfree'd memory.
  *      0.31: 14 Nov 2004: ethtool support for getting/setting link
- *                         capabilities.
+ *                         capabilities.
  *      0.32: 16 Apr 2005: RX_ERROR4 handling added.
  *      0.33: 16 May 2005: Support for MCP51 added.
  *      0.34: 18 Jun 2005: Add DEV_NEED_LINKTIMER to all nForce nics.
@@ -89,14 +89,17 @@
  *      0.37: 10 Jul 2005: Additional ethtool support, cleanup of pci id list
  *      0.38: 16 Jul 2005: tx irq rewrite: Use global flags instead of
  *                         per-packet flags.
- *      0.39: 18 Jul 2005: Add 64bit descriptor support.
- *      0.40: 19 Jul 2005: Add support for mac address change.
- *      0.41: 30 Jul 2005: Write back original MAC in nv_close instead
+ *      0.39: 18 Jul 2005: Add 64bit descriptor support.
+ *      0.40: 19 Jul 2005: Add support for mac address change.
+ *      0.41: 30 Jul 2005: Write back original MAC in nv_close instead
  *                         of nv_remove
- *      0.42: 06 Aug 2005: Fix lack of link speed initialization
+ *      0.42: 06 Aug 2005: Fix lack of link speed initialization
  *                         in the second (and later) nv_open call
- *      0.43: 10 Aug 2005: Add support for tx checksum.
- *      0.44: 20 Aug 2005: Add support for scatter gather and segmentation.
+ *      0.43: 10 Aug 2005: Add support for tx checksum.
+ *      0.44: 20 Aug 2005: Add support for scatter gather and segmentation.
+ *      0.45: 18 Sep 2005: Remove nv_stop/start_rx from every link check
+ *      0.46: 20 Oct 2005: Add irq optimization modes.
+ *      0.47: 26 Oct 2005: Add phyaddr 0 in phy scan.
  *
  * Known bugs:
  * We suspect that on some hardware no TX done interrupts are generated.
@@ -108,7 +111,7 @@
  * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
  * superfluous timer interrupts from the nic.
  */
-#define FORCEDETH_VERSION               "0.44"
+#define FORCEDETH_VERSION               "0.47"
 #define DRV_NAME                        "forcedeth"
 
 #include <linux/module.h>
@@ -163,7 +166,8 @@ enum {
 #define NVREG_IRQ_LINK                  0x0040
 #define NVREG_IRQ_TX_ERROR              0x0080
 #define NVREG_IRQ_TX1                   0x0100
-#define NVREG_IRQMASK_WANTED            0x00df
+#define NVREG_IRQMASK_THROUGHPUT        0x00df
+#define NVREG_IRQMASK_CPU               0x0040
 
 #define NVREG_IRQ_UNKNOWN       (~(NVREG_IRQ_RX_ERROR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_TX_ERR| \
                                         NVREG_IRQ_TX_OK|NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_TX_ERROR| \
@@ -177,7 +181,8 @@ enum {
  * NVREG_POLL_DEFAULT=97 would result in an interval length of 1 ms
  */
         NvRegPollingInterval = 0x00c,
-#define NVREG_POLL_DEFAULT      970
+#define NVREG_POLL_DEFAULT_THROUGHPUT   970
+#define NVREG_POLL_DEFAULT_CPU  13
         NvRegMisc1 = 0x080,
 #define NVREG_MISC1_HD          0x02
 #define NVREG_MISC1_FORCE       0x3b0f3c
@@ -538,6 +543,25 @@ struct fe_priv {
  */
 static int max_interrupt_work = 5;
 
+/*
+ * Optimization can be either throuput mode or cpu mode
+ * 
+ * Throughput Mode: Every tx and rx packet will generate an interrupt.
+ * CPU Mode: Interrupts are controlled by a timer.
+ */
+#define NV_OPTIMIZATION_MODE_THROUGHPUT 0
+#define NV_OPTIMIZATION_MODE_CPU        1
+static int optimization_mode = NV_OPTIMIZATION_MODE_THROUGHPUT;
+
+/*
+ * Poll interval for timer irq
+ *
+ * This interval determines how frequent an interrupt is generated.
+ * The is value is determined by [(time_in_micro_secs * 100) / (2^10)]
+ * Min = 0, and Max = 65535
+ */
+static int poll_interval = -1;
+
 static inline struct fe_priv *get_nvpriv(struct net_device *dev)
 {
         return netdev_priv(dev);
@@ -1328,67 +1352,71 @@ static void nv_rx_process(struct net_device *dev)
                         if (!(Flags & NV_RX_DESCRIPTORVALID))
                                 goto next_pkt;
 
-                        if (Flags & NV_RX_MISSEDFRAME) {
-                                np->stats.rx_missed_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & (NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3)) {
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX_CRCERR) {
-                                np->stats.rx_crc_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX_OVERFLOW) {
-                                np->stats.rx_over_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX_ERROR4) {
-                                len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
-                                if (len < 0) {
+                        if (Flags & NV_RX_ERROR) {
+                                if (Flags & NV_RX_MISSEDFRAME) {
+                                        np->stats.rx_missed_errors++;
                                         np->stats.rx_errors++;
                                         goto next_pkt;
                                 }
-                        }
-                        /* framing errors are soft errors. */
-                        if (Flags & NV_RX_FRAMINGERR) {
-                                if (Flags & NV_RX_SUBSTRACT1) {
-                                        len--;
+                                if (Flags & (NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3)) {
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX_CRCERR) {
+                                        np->stats.rx_crc_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX_OVERFLOW) {
+                                        np->stats.rx_over_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX_ERROR4) {
+                                        len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
+                                        if (len < 0) {
+                                                np->stats.rx_errors++;
+                                                goto next_pkt;
+                                        }
+                                }
+                                /* framing errors are soft errors. */
+                                if (Flags & NV_RX_FRAMINGERR) {
+                                        if (Flags & NV_RX_SUBSTRACT1) {
+                                                len--;
+                                        }
                                 }
                         }
                 } else {
                         if (!(Flags & NV_RX2_DESCRIPTORVALID))
                                 goto next_pkt;
 
-                        if (Flags & (NV_RX2_ERROR1|NV_RX2_ERROR2|NV_RX2_ERROR3)) {
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX2_CRCERR) {
-                                np->stats.rx_crc_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX2_OVERFLOW) {
-                                np->stats.rx_over_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX2_ERROR4) {
-                                len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
-                                if (len < 0) {
+                        if (Flags & NV_RX2_ERROR) {
+                                if (Flags & (NV_RX2_ERROR1|NV_RX2_ERROR2|NV_RX2_ERROR3)) {
                                         np->stats.rx_errors++;
                                         goto next_pkt;
                                 }
-                        }
-                        /* framing errors are soft errors */
-                        if (Flags & NV_RX2_FRAMINGERR) {
-                                if (Flags & NV_RX2_SUBSTRACT1) {
-                                        len--;
+                                if (Flags & NV_RX2_CRCERR) {
+                                        np->stats.rx_crc_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX2_OVERFLOW) {
+                                        np->stats.rx_over_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX2_ERROR4) {
+                                        len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
+                                        if (len < 0) {
+                                                np->stats.rx_errors++;
+                                                goto next_pkt;
+                                        }
+                                }
+                                /* framing errors are soft errors */
+                                if (Flags & NV_RX2_FRAMINGERR) {
+                                        if (Flags & NV_RX2_SUBSTRACT1) {
+                                                len--;
+                                        }
                                 }
                         }
                         Flags &= NV_RX2_CHECKSUMMASK;
@@ -1612,6 +1640,17 @@ static void nv_set_multicast(struct net_device *dev)
         spin_unlock_irq(&np->lock);
 }
 
+/**
+ * nv_update_linkspeed: Setup the MAC according to the link partner
+ * @dev: Network device to be configured
+ *
+ * The function queries the PHY and checks if there is a link partner.
+ * If yes, then it sets up the MAC accordingly. Otherwise, the MAC is
+ * set to 10 MBit HD.
+ *
+ * The function returns 0 if there is no link partner and 1 if there is
+ * a good link partner.
+ */
 static int nv_update_linkspeed(struct net_device *dev)
 {
         struct fe_priv *np = netdev_priv(dev);
@@ -1751,13 +1790,11 @@ set_speed:
 static void nv_linkchange(struct net_device *dev)
 {
         if (nv_update_linkspeed(dev)) {
-                if (netif_carrier_ok(dev)) {
-                        nv_stop_rx(dev);
-                } else {
+                if (!netif_carrier_ok(dev)) {
                         netif_carrier_on(dev);
                         printk(KERN_INFO "%s: link up.\n", dev->name);
+                        nv_start_rx(dev);
                 }
-                nv_start_rx(dev);
         } else {
                 if (netif_carrier_ok(dev)) {
                         netif_carrier_off(dev);
@@ -1799,22 +1836,18 @@ static irqreturn_t nv_nic_irq(int foo, void *data, struct pt_regs *regs)
                 if (!(events & np->irqmask))
                         break;
 
-                if (events & (NVREG_IRQ_TX1|NVREG_IRQ_TX_OK|NVREG_IRQ_TX_ERROR|NVREG_IRQ_TX_ERR)) {
+                spin_lock(&np->lock);
+                nv_tx_done(dev);
+                spin_unlock(&np->lock);
+                
+                nv_rx_process(dev);
+                if (nv_alloc_rx(dev)) {
                         spin_lock(&np->lock);
-                        nv_tx_done(dev);
+                        if (!np->in_shutdown)
+                                mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
                         spin_unlock(&np->lock);
                 }
-
-                if (events & (NVREG_IRQ_RX_ERROR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF)) {
-                        nv_rx_process(dev);
-                        if (nv_alloc_rx(dev)) {
-                                spin_lock(&np->lock);
-                                if (!np->in_shutdown)
-                                        mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
-                                spin_unlock(&np->lock);
-                        }
-                }
-
+                
                 if (events & NVREG_IRQ_LINK) {
                         spin_lock(&np->lock);
                         nv_link_irq(dev);
@@ -2216,7 +2249,14 @@ static int nv_open(struct net_device *dev)
         writel(NVREG_RNDSEED_FORCE | (i&NVREG_RNDSEED_MASK), base + NvRegRandomSeed);
         writel(NVREG_UNKSETUP1_VAL, base + NvRegUnknownSetupReg1);
         writel(NVREG_UNKSETUP2_VAL, base + NvRegUnknownSetupReg2);
-        writel(NVREG_POLL_DEFAULT, base + NvRegPollingInterval);
+        if (poll_interval == -1) {
+                if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT)
+                        writel(NVREG_POLL_DEFAULT_THROUGHPUT, base + NvRegPollingInterval);
+                else
+                        writel(NVREG_POLL_DEFAULT_CPU, base + NvRegPollingInterval);
+        }
+        else
+                writel(poll_interval & 0xFFFF, base + NvRegPollingInterval);
         writel(NVREG_UNKSETUP6_VAL, base + NvRegUnknownSetupReg6);
         writel((np->phyaddr << NVREG_ADAPTCTL_PHYSHIFT)|NVREG_ADAPTCTL_PHYVALID|NVREG_ADAPTCTL_RUNNING,
                         base + NvRegAdapterControl);
@@ -2501,7 +2541,11 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         } else {
                 np->tx_flags = NV_TX2_VALID;
         }
-        np->irqmask = NVREG_IRQMASK_WANTED;
+        if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT)
+                np->irqmask = NVREG_IRQMASK_THROUGHPUT;
+        else
+                np->irqmask = NVREG_IRQMASK_CPU;
+
         if (id->driver_data & DEV_NEED_TIMERIRQ)
                 np->irqmask |= NVREG_IRQ_TIMER;
         if (id->driver_data & DEV_NEED_LINKTIMER) {
@@ -2514,16 +2558,17 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         }
 
         /* find a suitable phy */
-        for (i = 1; i < 32; i++) {
+        for (i = 1; i <= 32; i++) {
                 int id1, id2;
+                int phyaddr = i & 0x1F;
 
                 spin_lock_irq(&np->lock);
-                id1 = mii_rw(dev, i, MII_PHYSID1, MII_READ);
+                id1 = mii_rw(dev, phyaddr, MII_PHYSID1, MII_READ);
                 spin_unlock_irq(&np->lock);
                 if (id1 < 0 || id1 == 0xffff)
                         continue;
                 spin_lock_irq(&np->lock);
-                id2 = mii_rw(dev, i, MII_PHYSID2, MII_READ);
+                id2 = mii_rw(dev, phyaddr, MII_PHYSID2, MII_READ);
                 spin_unlock_irq(&np->lock);
                 if (id2 < 0 || id2 == 0xffff)
                         continue;
@@ -2531,23 +2576,19 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 id1 = (id1 & PHYID1_OUI_MASK) << PHYID1_OUI_SHFT;
                 id2 = (id2 & PHYID2_OUI_MASK) >> PHYID2_OUI_SHFT;
                 dprintk(KERN_DEBUG "%s: open: Found PHY %04x:%04x at address %d.\n",
-                                pci_name(pci_dev), id1, id2, i);
-                np->phyaddr = i;
+                        pci_name(pci_dev), id1, id2, phyaddr);
+                np->phyaddr = phyaddr;
                 np->phy_oui = id1 | id2;
                 break;
         }
-        if (i == 32) {
-                /* PHY in isolate mode? No phy attached and user wants to
-                 * test loopback? Very odd, but can be correct.
-                 */
+        if (i == 33) {
                 printk(KERN_INFO "%s: open: Could not find a valid PHY.\n",
-                                pci_name(pci_dev));
-        }
-
-        if (i != 32) {
-                /* reset it */
-                phy_init(dev);
+                       pci_name(pci_dev));
+                goto out_freering;
         }
+        
+        /* reset it */
+        phy_init(dev);
 
         /* set default link speed settings */
         np->linkspeed = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
@@ -2689,6 +2730,10 @@ static void __exit exit_nic(void)
 
 module_param(max_interrupt_work, int, 0);
 MODULE_PARM_DESC(max_interrupt_work, "forcedeth maximum events handled per interrupt");
+module_param(optimization_mode, int, 0);
+MODULE_PARM_DESC(optimization_mode, "In throughput mode (0), every tx & rx packet will generate an interrupt. In CPU mode (1), interrupts are controlled by a timer.");
+module_param(poll_interval, int, 0);
+MODULE_PARM_DESC(poll_interval, "Interval determines how frequent timer interrupt is generated by [(time_in_micro_secs * 100) / (2^10)]. Min is 0 and Max is 65535.");
 
 MODULE_AUTHOR("Manfred Spraul <manfred@colorfullife.com>");
 MODULE_DESCRIPTION("Reverse Engineered nForce ethernet driver");
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 9342d5bc7bb4..f5d49a110654 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -37,6 +37,7 @@
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
 #include <linux/fs.h>
+#include <linux/platform_device.h>
 
 #include <linux/vmalloc.h>
 #include <asm/pgtable.h>
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index a940b96433c7..e67b1d06611c 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -34,6 +34,7 @@
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
 #include <linux/fs.h>
+#include <linux/platform_device.h>
 
 #include <asm/immap_cpm2.h>
 #include <asm/mpc8260.h>
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index 5ef4e845a387..2e8f44469699 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -34,6 +34,7 @@
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
 #include <linux/fs.h>
+#include <linux/platform_device.h>
 
 #include <asm/irq.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index d8c6e9cadcf5..a3897fda71fa 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -34,6 +34,7 @@
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
 #include <linux/fs.h>
+#include <linux/platform_device.h>
 
 #include <asm/irq.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 54d294ad6df5..e3a329539f1c 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -126,8 +126,8 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static void adjust_link(struct net_device *dev);
 static void init_registers(struct net_device *dev);
 static int init_phy(struct net_device *dev);
-static int gfar_probe(struct device *device);
-static int gfar_remove(struct device *device);
+static int gfar_probe(struct platform_device *pdev);
+static int gfar_remove(struct platform_device *pdev);
 static void free_skb_resources(struct gfar_private *priv);
 static void gfar_set_multi(struct net_device *dev);
 static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr);
@@ -156,12 +156,11 @@ int gfar_uses_fcb(struct gfar_private *priv)
 
 /* Set up the ethernet device structure, private data,
  * and anything else we need before we start */
-static int gfar_probe(struct device *device)
+static int gfar_probe(struct platform_device *pdev)
 {
         u32 tempval;
         struct net_device *dev = NULL;
         struct gfar_private *priv = NULL;
-        struct platform_device *pdev = to_platform_device(device);
         struct gianfar_platform_data *einfo;
         struct resource *r;
         int idx;
@@ -208,7 +207,7 @@ static int gfar_probe(struct device *device)
 
         spin_lock_init(&priv->lock);
 
-        dev_set_drvdata(device, dev);
+        platform_set_drvdata(pdev, dev);
 
         /* Stop the DMA engine now, in case it was running before */
         /* (The firmware could have used it, and left it running). */
@@ -245,7 +244,7 @@ static int gfar_probe(struct device *device)
         dev->base_addr = (unsigned long) (priv->regs);
 
         SET_MODULE_OWNER(dev);
-        SET_NETDEV_DEV(dev, device);
+        SET_NETDEV_DEV(dev, &pdev->dev);
 
         /* Fill in the dev structure */
         dev->open = gfar_enet_open;
@@ -377,12 +376,12 @@ regs_fail:
         return err;
 }
 
-static int gfar_remove(struct device *device)
+static int gfar_remove(struct platform_device *pdev)
 {
-        struct net_device *dev = dev_get_drvdata(device);
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct gfar_private *priv = netdev_priv(dev);
 
-        dev_set_drvdata(device, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         iounmap((void *) priv->regs);
         free_netdev(dev);
@@ -1861,11 +1860,12 @@ static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 /* Structure for a device driver */
-static struct device_driver gfar_driver = {
-        .name = "fsl-gianfar",
-        .bus = &platform_bus_type,
+static struct platform_driver gfar_driver = {
         .probe = gfar_probe,
         .remove = gfar_remove,
+        .driver = {
+                .name = "fsl-gianfar",
+        },
 };
 
 static int __init gfar_init(void)
@@ -1875,7 +1875,7 @@ static int __init gfar_init(void)
         if (err)
                 return err;
 
-        err = driver_register(&gfar_driver);
+        err = platform_driver_register(&gfar_driver);
 
         if (err)
                 gfar_mdio_exit();
@@ -1885,7 +1885,7 @@ static int __init gfar_init(void)
 
 static void __exit gfar_exit(void)
 {
-        driver_unregister(&gfar_driver);
+        platform_driver_unregister(&gfar_driver);
         gfar_mdio_exit();
 }
 
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index 7263395d78bb..9544279e8bcd 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -133,7 +133,7 @@ int gfar_mdio_probe(struct device *dev)
         if (NULL == dev)
                 return -EINVAL;
 
-        new_bus = kmalloc(sizeof(struct mii_bus), GFP_KERNEL);
+        new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);
 
         if (NULL == new_bus)
                 return -ENOMEM;
diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index 666cfbbcf6d9..5958a6314723 100644
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c
@@ -72,8 +72,6 @@ static void dump_tx_desc(int dbg_lvl, struct net_device *dev, int i);
 static void dump_rx_desc(int dbg_lvl, struct net_device *dev, int i);
 static void dump_skb(int dbg_lvl, struct net_device *dev,
                      struct sk_buff *skb);
-static void dump_hw_addr(int dbg_lvl, struct net_device *dev,
-                         const char* pfx, unsigned char* addr_str);
 static void update_stats(struct gt96100_private *gp);
 static void abort(struct net_device *dev, u32 abort_bits);
 static void hard_stop(struct net_device *dev);
@@ -334,13 +332,13 @@ dump_MII(int dbg_lvl, struct net_device *dev)
 
 static void
 dump_hw_addr(int dbg_lvl, struct net_device *dev, const char* pfx,
-             unsigned char* addr_str)
+             const char* func, unsigned char* addr_str)
 {
         int i;
         char buf[100], octet[5];
     
         if (dbg_lvl <= GT96100_DEBUG) {
-                strcpy(buf, pfx);
+                sprintf(buf, pfx, func);
                 for (i = 0; i < 6; i++) {
                         sprintf(octet, "%2.2x%s",
                                 addr_str[i], i<5 ? ":" : "\n");
@@ -708,7 +706,7 @@ static int __init gt96100_probe1(struct pci_dev *pci, int port_num)
 
         info("%s found at 0x%x, irq %d\n",
              chip_name(gp->chip_rev), gtif->iobase, gtif->irq);
-        dump_hw_addr(0, dev, "HW Address ", dev->dev_addr);
+        dump_hw_addr(0, dev, "%s: HW Address ", __FUNCTION__, dev->dev_addr);
         info("%s chip revision=%d\n", chip_name(gp->chip_rev), gp->chip_rev);
         info("%s ethernet port %d\n", chip_name(gp->chip_rev), gp->port_num);
         info("external PHY ID1=0x%04x, ID2=0x%04x\n", phy_id1, phy_id2);
@@ -1488,7 +1486,7 @@ gt96100_set_rx_mode(struct net_device *dev)
                 gt96100_add_hash_entry(dev, dev->dev_addr);
 
                 for (mcptr = dev->mc_list; mcptr; mcptr = mcptr->next) {
-                        dump_hw_addr(2, dev, __FUNCTION__ ": addr=",
+                        dump_hw_addr(2, dev, "%s: addr=", __FUNCTION__,
                                      mcptr->dmi_addr);
                         gt96100_add_hash_entry(dev, mcptr->dmi_addr);
                 }
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index be191d80ef9c..ceb98fd398af 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -58,7 +58,7 @@
 
 #include "ibmveth.h"
 
-#define DEBUG 1
+#undef DEBUG
 
 #define ibmveth_printk(fmt, args...) \
   printk(KERN_INFO "%s: " fmt, __FILE__, ## args)
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 76e0b9fb5e96..63d38fbbd04e 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -291,9 +291,9 @@ static void sa1100_irda_shutdown(struct sa1100_irda *si)
 /*
  * Suspend the IrDA interface.
  */
-static int sa1100_irda_suspend(struct device *_dev, pm_message_t state)
+static int sa1100_irda_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct net_device *dev = dev_get_drvdata(_dev);
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct sa1100_irda *si;
 
         if (!dev)
@@ -316,9 +316,9 @@ static int sa1100_irda_suspend(struct device *_dev, pm_message_t state)
 /*
  * Resume the IrDA interface.
  */
-static int sa1100_irda_resume(struct device *_dev)
+static int sa1100_irda_resume(struct platform_device *pdev)
 {
-        struct net_device *dev = dev_get_drvdata(_dev);
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct sa1100_irda *si;
 
         if (!dev)
@@ -886,9 +886,8 @@ static int sa1100_irda_init_iobuf(iobuff_t *io, int size)
         return io->head ? 0 : -ENOMEM;
 }
 
-static int sa1100_irda_probe(struct device *_dev)
+static int sa1100_irda_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(_dev);
         struct net_device *dev;
         struct sa1100_irda *si;
         unsigned int baudrate_mask;
@@ -967,7 +966,7 @@ static int sa1100_irda_probe(struct device *_dev)
 
         err = register_netdev(dev);
         if (err == 0)
-                dev_set_drvdata(&pdev->dev, dev);
+                platform_set_drvdata(pdev, dev);
 
         if (err) {
  err_mem_5:
@@ -985,9 +984,9 @@ static int sa1100_irda_probe(struct device *_dev)
         return err;
 }
 
-static int sa1100_irda_remove(struct device *_dev)
+static int sa1100_irda_remove(struct platform_device *pdev)
 {
-        struct net_device *dev = dev_get_drvdata(_dev);
+        struct net_device *dev = platform_get_drvdata(pdev);
 
         if (dev) {
                 struct sa1100_irda *si = dev->priv;
@@ -1004,13 +1003,14 @@ static int sa1100_irda_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver sa1100ir_driver = {
-        .name           = "sa11x0-ir",
-        .bus            = &platform_bus_type,
+static struct platform_driver sa1100ir_driver = {
         .probe          = sa1100_irda_probe,
         .remove         = sa1100_irda_remove,
         .suspend        = sa1100_irda_suspend,
         .resume         = sa1100_irda_resume,
+        .driver         = {
+                .name   = "sa11x0-ir",
+        },
 };
 
 static int __init sa1100_irda_init(void)
@@ -1023,12 +1023,12 @@ static int __init sa1100_irda_init(void)
         if (power_level > 3)
                 power_level = 3;
 
-        return driver_register(&sa1100ir_driver);
+        return platform_driver_register(&sa1100ir_driver);
 }
 
 static void __exit sa1100_irda_exit(void)
 {
-        driver_unregister(&sa1100ir_driver);
+        platform_driver_unregister(&sa1100ir_driver);
 }
 
 module_init(sa1100_irda_init);
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index a1d207f2fa68..ec94ecdb103d 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -214,14 +214,15 @@ static int  smsc_ircc_probe_transceiver_smsc_ircc_atc(int fir_base);
 
 /* Power Management */
 
-static int smsc_ircc_suspend(struct device *dev, pm_message_t state);
-static int smsc_ircc_resume(struct device *dev);
+static int smsc_ircc_suspend(struct platform_device *dev, pm_message_t state);
+static int smsc_ircc_resume(struct platform_device *dev);
 
-static struct device_driver smsc_ircc_driver = {
-        .name           = SMSC_IRCC2_DRIVER_NAME,
-        .bus            = &platform_bus_type,
+static struct platform_driver smsc_ircc_driver = {
         .suspend        = smsc_ircc_suspend,
         .resume         = smsc_ircc_resume,
+        .driver         = {
+                .name   = SMSC_IRCC2_DRIVER_NAME,
+        },
 };
 
 /* Transceivers for SMSC-ircc */
@@ -346,7 +347,7 @@ static int __init smsc_ircc_init(void)
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
-        ret = driver_register(&smsc_ircc_driver);
+        ret = platform_driver_register(&smsc_ircc_driver);
         if (ret) {
                 IRDA_ERROR("%s, Can't register driver!\n", driver_name);
                 return ret;
@@ -378,7 +379,7 @@ static int __init smsc_ircc_init(void)
         }
 
         if (ret)
-                driver_unregister(&smsc_ircc_driver);
+                platform_driver_unregister(&smsc_ircc_driver);
 
         return ret;
 }
@@ -491,7 +492,7 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
                 err = PTR_ERR(self->pldev);
                 goto err_out5;
         }
-        dev_set_drvdata(&self->pldev->dev, self);
+        platform_set_drvdata(self->pldev, self);
 
         IRDA_MESSAGE("IrDA: Registered device %s\n", dev->name);
         dev_count++;
@@ -1685,9 +1686,9 @@ static int smsc_ircc_net_close(struct net_device *dev)
         return 0;
 }
 
-static int smsc_ircc_suspend(struct device *dev, pm_message_t state)
+static int smsc_ircc_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
+        struct smsc_ircc_cb *self = platform_get_drvdata(dev);
 
         if (!self->io.suspended) {
                 IRDA_DEBUG(1, "%s, Suspending\n", driver_name);
@@ -1706,9 +1707,9 @@ static int smsc_ircc_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int smsc_ircc_resume(struct device *dev)
+static int smsc_ircc_resume(struct platform_device *dev)
 {
-        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
+        struct smsc_ircc_cb *self = platform_get_drvdata(dev);
 
         if (self->io.suspended) {
                 IRDA_DEBUG(1, "%s, Waking up\n", driver_name);
@@ -1788,7 +1789,7 @@ static void __exit smsc_ircc_cleanup(void)
                         smsc_ircc_close(dev_self[i]);
         }
 
-        driver_unregister(&smsc_ircc_driver);
+        platform_driver_unregister(&smsc_ircc_driver);
 }
 
 /*
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 2fb3101cb33e..b039bd89ceb9 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -194,7 +194,7 @@ out:
  * Probe for a SONIC ethernet controller on a Mips Jazz board.
  * Actually probing is superfluous but we're paranoid.
  */
-static int __init jazz_sonic_probe(struct device *device)
+static int __init jazz_sonic_probe(struct platform_device *pdev)
 {
         struct net_device *dev;
         struct sonic_local *lp;
@@ -212,8 +212,8 @@ static int __init jazz_sonic_probe(struct device *device)
                 return -ENOMEM;
 
         lp = netdev_priv(dev);
-        lp->device = device;
-        SET_NETDEV_DEV(dev, device);
+        lp->device = &pdev->dev;
+        SET_NETDEV_DEV(dev, &pdev->dev);
         SET_MODULE_OWNER(dev);
 
         netdev_boot_setup_check(dev);
@@ -264,9 +264,9 @@ MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)");
 
 #include "sonic.c"
 
-static int __devexit jazz_sonic_device_remove (struct device *device)
+static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
 {
-        struct net_device *dev = device->driver_data;
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct sonic_local* lp = netdev_priv(dev);
 
         unregister_netdev (dev);
@@ -278,18 +278,19 @@ static int __devexit jazz_sonic_device_remove (struct device *device)
         return 0;
 }
 
-static struct device_driver jazz_sonic_driver = {
-        .name   = jazz_sonic_string,
-        .bus    = &platform_bus_type,
+static struct platform_driver jazz_sonic_driver = {
         .probe  = jazz_sonic_probe,
         .remove = __devexit_p(jazz_sonic_device_remove),
+        .driver = {
+                .name   = jazz_sonic_string,
+        },
 };
 
 static int __init jazz_sonic_init_module(void)
 {
         int err;
 
-        if ((err = driver_register(&jazz_sonic_driver))) {
+        if ((err = platform_driver_register(&jazz_sonic_driver))) {
                 printk(KERN_ERR "Driver registration failed\n");
                 return err;
         }
@@ -313,7 +314,7 @@ out_unregister:
 
 static void __exit jazz_sonic_cleanup_module(void)
 {
-        driver_unregister(&jazz_sonic_driver);
+        platform_driver_unregister(&jazz_sonic_driver);
 
         if (jazz_sonic_device) {
                 platform_device_unregister(jazz_sonic_device);
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index 9ef4592aca03..02d5c6822733 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -525,7 +525,7 @@ int __init mac_nubus_sonic_probe(struct net_device* dev)
         return macsonic_init(dev);
 }
 
-static int __init mac_sonic_probe(struct device *device)
+static int __init mac_sonic_probe(struct platform_device *device)
 {
         struct net_device *dev;
         struct sonic_local *lp;
@@ -537,8 +537,8 @@ static int __init mac_sonic_probe(struct device *device)
                 return -ENOMEM;
 
         lp = netdev_priv(dev);
-        lp->device = device;
-        SET_NETDEV_DEV(dev, device);
+        lp->device = &device->dev;
+        SET_NETDEV_DEV(dev, &device->dev);
         SET_MODULE_OWNER(dev);
 
         /* This will catch fatal stuff like -ENOMEM as well as success */
@@ -579,9 +579,9 @@ MODULE_PARM_DESC(sonic_debug, "macsonic debug level (1-4)");
 
 #include "sonic.c"
 
-static int __devexit mac_sonic_device_remove (struct device *device)
+static int __devexit mac_sonic_device_remove (struct platform_device *device)
 {
-        struct net_device *dev = device->driver_data;
+        struct net_device *dev = platform_get_drvdata(device);
         struct sonic_local* lp = netdev_priv(dev);
 
         unregister_netdev (dev);
@@ -592,18 +592,19 @@ static int __devexit mac_sonic_device_remove (struct device *device)
         return 0;
 }
 
-static struct device_driver mac_sonic_driver = {
-        .name   = mac_sonic_string,
-        .bus    = &platform_bus_type,
+static struct platform_driver mac_sonic_driver = {
         .probe  = mac_sonic_probe,
         .remove = __devexit_p(mac_sonic_device_remove),
+        .driver = {
+                .name = mac_sonic_string,
+        },
 };
 
 static int __init mac_sonic_init_module(void)
 {
         int err;
 
-        if ((err = driver_register(&mac_sonic_driver))) {
+        if ((err = platform_driver_register(&mac_sonic_driver))) {
                 printk(KERN_ERR "Driver registration failed\n");
                 return err;
         }
@@ -628,7 +629,7 @@ out_unregister:
 
 static void __exit mac_sonic_cleanup_module(void)
 {
-        driver_unregister(&mac_sonic_driver);
+        platform_driver_unregister(&mac_sonic_driver);
 
         if (mac_sonic_device) {
                 platform_device_unregister(mac_sonic_device);
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 71f2c6705bc3..3cb9b3fe0cf1 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1387,9 +1387,8 @@ static void mv643xx_netpoll(struct net_device *netdev)
  * Input :      struct device *
  * Output :     -ENOMEM if failed , 0 if success
  */
-static int mv643xx_eth_probe(struct device *ddev)
+static int mv643xx_eth_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(ddev);
         struct mv643xx_eth_platform_data *pd;
         int port_num = pdev->id;
         struct mv643xx_private *mp;
@@ -1402,7 +1401,7 @@ static int mv643xx_eth_probe(struct device *ddev)
         if (!dev)
                 return -ENOMEM;
 
-        dev_set_drvdata(ddev, dev);
+        platform_set_drvdata(pdev, dev);
 
         mp = netdev_priv(dev);
 
@@ -1546,21 +1545,20 @@ out:
         return err;
 }
 
-static int mv643xx_eth_remove(struct device *ddev)
+static int mv643xx_eth_remove(struct platform_device *pdev)
 {
-        struct net_device *dev = dev_get_drvdata(ddev);
+        struct net_device *dev = platform_get_drvdata(pdev);
 
         unregister_netdev(dev);
         flush_scheduled_work();
 
         free_netdev(dev);
-        dev_set_drvdata(ddev, NULL);
+        platform_set_drvdata(pdev, NULL);
         return 0;
 }
 
-static int mv643xx_eth_shared_probe(struct device *ddev)
+static int mv643xx_eth_shared_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(ddev);
         struct resource *res;
 
         printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
@@ -1578,7 +1576,7 @@ static int mv643xx_eth_shared_probe(struct device *ddev)
 
 }
 
-static int mv643xx_eth_shared_remove(struct device *ddev)
+static int mv643xx_eth_shared_remove(struct platform_device *pdev)
 {
         iounmap(mv643xx_eth_shared_base);
         mv643xx_eth_shared_base = NULL;
@@ -1586,18 +1584,20 @@ static int mv643xx_eth_shared_remove(struct device *ddev)
         return 0;
 }
 
-static struct device_driver mv643xx_eth_driver = {
-        .name = MV643XX_ETH_NAME,
-        .bus = &platform_bus_type,
+static struct platform_driver mv643xx_eth_driver = {
         .probe = mv643xx_eth_probe,
         .remove = mv643xx_eth_remove,
+        .driver = {
+                .name = MV643XX_ETH_NAME,
+        },
 };
 
-static struct device_driver mv643xx_eth_shared_driver = {
-        .name = MV643XX_ETH_SHARED_NAME,
-        .bus = &platform_bus_type,
+static struct platform_driver mv643xx_eth_shared_driver = {
         .probe = mv643xx_eth_shared_probe,
         .remove = mv643xx_eth_shared_remove,
+        .driver = {
+                .name = MV643XX_ETH_SHARED_NAME,
+        },
 };
 
 /*
@@ -1613,11 +1613,11 @@ static int __init mv643xx_init_module(void)
 {
         int rc;
 
-        rc = driver_register(&mv643xx_eth_shared_driver);
+        rc = platform_driver_register(&mv643xx_eth_shared_driver);
         if (!rc) {
-                rc = driver_register(&mv643xx_eth_driver);
+                rc = platform_driver_register(&mv643xx_eth_driver);
                 if (rc)
-                        driver_unregister(&mv643xx_eth_shared_driver);
+                        platform_driver_unregister(&mv643xx_eth_shared_driver);
         }
         return rc;
 }
@@ -1633,8 +1633,8 @@ static int __init mv643xx_init_module(void)
  */
 static void __exit mv643xx_cleanup_module(void)
 {
-        driver_unregister(&mv643xx_eth_driver);
-        driver_unregister(&mv643xx_eth_shared_driver);
+        platform_driver_unregister(&mv643xx_eth_driver);
+        platform_driver_unregister(&mv643xx_eth_shared_driver);
 }
 
 module_init(mv643xx_init_module);
diff --git a/drivers/net/saa9730.c b/drivers/net/saa9730.c
index 110e777f206e..b2acedbefa8f 100644
--- a/drivers/net/saa9730.c
+++ b/drivers/net/saa9730.c
@@ -1,8 +1,8 @@
 /*
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
- *
- * ########################################################################
+ * Copyright (C) 2000, 2005  MIPS Technologies, Inc.  All rights reserved.
+ *      Authors: Carsten Langgaard <carstenl@mips.com>
+ *               Maciej W. Rozycki <macro@mips.com>
+ * Copyright (C) 2004 Ralf Baechle <ralf@linux-mips.org>
  *
  *  This program is free software; you can distribute it and/or modify it
  *  under the terms of the GNU General Public License (Version 2) as
@@ -17,15 +17,13 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  *
- * ########################################################################
- *
  * SAA9730 ethernet driver.
  *
  * Changes:
- * Angelo Dell'Aera <buffer@antifork.org> : Conversion to the new PCI API (pci_driver).
- *                                          Conversion to spinlocks.
- *                                          Error handling fixes.
- *                                           
+ * Angelo Dell'Aera <buffer@antifork.org> :     Conversion to the new PCI API
+ *                                              (pci_driver).
+ *                                              Conversion to spinlocks.
+ *                                              Error handling fixes.
  */
 
 #include <linux/init.h>
@@ -36,8 +34,11 @@
 #include <linux/skbuff.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+#include <linux/types.h>
 
 #include <asm/addrspace.h>
+#include <asm/io.h>
+
 #include <asm/mips-boards/prom.h>
 
 #include "saa9730.h"
@@ -51,8 +52,8 @@ int lan_saa9730_debug;
 #define DRV_MODULE_NAME "saa9730"
 
 static struct pci_device_id saa9730_pci_tbl[] = {
-        { PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA9370,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+        { PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA9730,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
         { 0, }
 };
 
@@ -61,50 +62,48 @@ MODULE_DEVICE_TABLE(pci, saa9730_pci_tbl);
 /* Non-zero only if the current card is a PCI with BIOS-set IRQ. */
 static unsigned int pci_irq_line;
 
-#define INL(a)     inl((unsigned long)a)
-#define OUTL(x,a)  outl(x,(unsigned long)a)
-
 static void evm_saa9730_enable_lan_int(struct lan_saa9730_private *lp)
 {
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptBlock1) | EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptBlock1) | EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptBlock1);
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptStatus1) | EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptStatus1) | EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptStatus1);
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptEnable1) | EVM_LAN_INT |
+        outl(readl(&lp->evm_saa9730_regs->InterruptEnable1) | EVM_LAN_INT |
              EVM_MASTER_EN, &lp->evm_saa9730_regs->InterruptEnable1);
 }
+
 static void evm_saa9730_disable_lan_int(struct lan_saa9730_private *lp)
 {
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptBlock1) & ~EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptBlock1) & ~EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptBlock1);
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptEnable1) & ~EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptEnable1) & ~EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptEnable1);
 }
 
 static void evm_saa9730_clear_lan_int(struct lan_saa9730_private *lp)
 {
-        OUTL(EVM_LAN_INT, &lp->evm_saa9730_regs->InterruptStatus1);
+        outl(EVM_LAN_INT, &lp->evm_saa9730_regs->InterruptStatus1);
 }
 
 static void evm_saa9730_block_lan_int(struct lan_saa9730_private *lp)
 {
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptBlock1) & ~EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptBlock1) & ~EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptBlock1);
 }
 
 static void evm_saa9730_unblock_lan_int(struct lan_saa9730_private *lp)
 {
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptBlock1) | EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptBlock1) | EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptBlock1);
 }
 
-static void show_saa9730_regs(struct lan_saa9730_private *lp)
+static void __attribute_used__ show_saa9730_regs(struct lan_saa9730_private *lp)
 {
         int i, j;
-        printk("TxmBufferA = %x\n", lp->TxmBuffer[0][0]);
-        printk("TxmBufferB = %x\n", lp->TxmBuffer[1][0]);
-        printk("RcvBufferA = %x\n", lp->RcvBuffer[0][0]);
-        printk("RcvBufferB = %x\n", lp->RcvBuffer[1][0]);
+        printk("TxmBufferA = %p\n", lp->TxmBuffer[0][0]);
+        printk("TxmBufferB = %p\n", lp->TxmBuffer[1][0]);
+        printk("RcvBufferA = %p\n", lp->RcvBuffer[0][0]);
+        printk("RcvBufferB = %p\n", lp->RcvBuffer[1][0]);
         for (i = 0; i < LAN_SAA9730_BUFFERS; i++) {
                 for (j = 0; j < LAN_SAA9730_TXM_Q_SIZE; j++) {
                         printk("TxmBuffer[%d][%d] = %x\n", i, j,
@@ -120,13 +119,13 @@ static void show_saa9730_regs(struct lan_saa9730_private *lp)
                 }
         }
         printk("lp->evm_saa9730_regs->InterruptBlock1 = %x\n",
-               INL(&lp->evm_saa9730_regs->InterruptBlock1));
+               readl(&lp->evm_saa9730_regs->InterruptBlock1));
         printk("lp->evm_saa9730_regs->InterruptStatus1 = %x\n",
-               INL(&lp->evm_saa9730_regs->InterruptStatus1));
+               readl(&lp->evm_saa9730_regs->InterruptStatus1));
         printk("lp->evm_saa9730_regs->InterruptEnable1 = %x\n",
-               INL(&lp->evm_saa9730_regs->InterruptEnable1));
+               readl(&lp->evm_saa9730_regs->InterruptEnable1));
         printk("lp->lan_saa9730_regs->Ok2Use = %x\n",
-               INL(&lp->lan_saa9730_regs->Ok2Use));
+               readl(&lp->lan_saa9730_regs->Ok2Use));
         printk("lp->NextTxmBufferIndex = %x\n", lp->NextTxmBufferIndex);
         printk("lp->NextTxmPacketIndex = %x\n", lp->NextTxmPacketIndex);
         printk("lp->PendingTxmBufferIndex = %x\n",
@@ -134,23 +133,23 @@ static void show_saa9730_regs(struct lan_saa9730_private *lp)
         printk("lp->PendingTxmPacketIndex = %x\n",
                lp->PendingTxmPacketIndex);
         printk("lp->lan_saa9730_regs->LanDmaCtl = %x\n",
-               INL(&lp->lan_saa9730_regs->LanDmaCtl));
+               readl(&lp->lan_saa9730_regs->LanDmaCtl));
         printk("lp->lan_saa9730_regs->DmaStatus = %x\n",
-               INL(&lp->lan_saa9730_regs->DmaStatus));
+               readl(&lp->lan_saa9730_regs->DmaStatus));
         printk("lp->lan_saa9730_regs->CamCtl = %x\n",
-               INL(&lp->lan_saa9730_regs->CamCtl));
+               readl(&lp->lan_saa9730_regs->CamCtl));
         printk("lp->lan_saa9730_regs->TxCtl = %x\n",
-               INL(&lp->lan_saa9730_regs->TxCtl));
+               readl(&lp->lan_saa9730_regs->TxCtl));
         printk("lp->lan_saa9730_regs->TxStatus = %x\n",
-               INL(&lp->lan_saa9730_regs->TxStatus));
+               readl(&lp->lan_saa9730_regs->TxStatus));
         printk("lp->lan_saa9730_regs->RxCtl = %x\n",
-               INL(&lp->lan_saa9730_regs->RxCtl));
+               readl(&lp->lan_saa9730_regs->RxCtl));
         printk("lp->lan_saa9730_regs->RxStatus = %x\n",
-               INL(&lp->lan_saa9730_regs->RxStatus));
+               readl(&lp->lan_saa9730_regs->RxStatus));
         for (i = 0; i < LAN_SAA9730_CAM_DWORDS; i++) {
-                OUTL(i, &lp->lan_saa9730_regs->CamAddress);
+                outl(i, &lp->lan_saa9730_regs->CamAddress);
                 printk("lp->lan_saa9730_regs->CamData = %x\n",
-                       INL(&lp->lan_saa9730_regs->CamData));
+                       readl(&lp->lan_saa9730_regs->CamData));
         }
         printk("lp->stats.tx_packets = %lx\n", lp->stats.tx_packets);
         printk("lp->stats.tx_errors = %lx\n", lp->stats.tx_errors);
@@ -178,17 +177,17 @@ static void show_saa9730_regs(struct lan_saa9730_private *lp)
                lp->stats.rx_length_errors);
 
         printk("lp->lan_saa9730_regs->DebugPCIMasterAddr = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugPCIMasterAddr));
+               readl(&lp->lan_saa9730_regs->DebugPCIMasterAddr));
         printk("lp->lan_saa9730_regs->DebugLanTxStateMachine = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugLanTxStateMachine));
+               readl(&lp->lan_saa9730_regs->DebugLanTxStateMachine));
         printk("lp->lan_saa9730_regs->DebugLanRxStateMachine = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugLanRxStateMachine));
+               readl(&lp->lan_saa9730_regs->DebugLanRxStateMachine));
         printk("lp->lan_saa9730_regs->DebugLanTxFifoPointers = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugLanTxFifoPointers));
+               readl(&lp->lan_saa9730_regs->DebugLanTxFifoPointers));
         printk("lp->lan_saa9730_regs->DebugLanRxFifoPointers = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugLanRxFifoPointers));
+               readl(&lp->lan_saa9730_regs->DebugLanRxFifoPointers));
         printk("lp->lan_saa9730_regs->DebugLanCtlStateMachine = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugLanCtlStateMachine));
+               readl(&lp->lan_saa9730_regs->DebugLanCtlStateMachine));
 }
 
 static void lan_saa9730_buffer_init(struct lan_saa9730_private *lp)
@@ -214,98 +213,108 @@ static void lan_saa9730_buffer_init(struct lan_saa9730_private *lp)
         }
 }
 
-static int lan_saa9730_allocate_buffers(struct lan_saa9730_private *lp)
+static void lan_saa9730_free_buffers(struct pci_dev *pdev,
+                                     struct lan_saa9730_private *lp)
 {
-        unsigned int mem_size;
-        void *Pa;
-        unsigned int i, j, RcvBufferSize, TxmBufferSize;
-        unsigned int buffer_start;
+        pci_free_consistent(pdev, lp->buffer_size, lp->buffer_start,
+                            lp->dma_addr);
+}
 
-        /* 
-         * Allocate all RX and TX packets in one chunk. 
-         * The Rx and Tx packets must be PACKET_SIZE aligned.
-         */
-        mem_size = ((LAN_SAA9730_RCV_Q_SIZE + LAN_SAA9730_TXM_Q_SIZE) *
-                    LAN_SAA9730_PACKET_SIZE * LAN_SAA9730_BUFFERS) +
-            LAN_SAA9730_PACKET_SIZE;
-        buffer_start =
-            (unsigned int) kmalloc(mem_size, GFP_DMA | GFP_KERNEL);
-
-        if (!buffer_start)
-                return -ENOMEM;
-
-        /* 
-         * Set DMA buffer to kseg1 (uncached).
-         * Make sure to flush before using it uncached.
-         */
-        Pa = (void *) KSEG1ADDR((buffer_start + LAN_SAA9730_PACKET_SIZE) &
-                                ~(LAN_SAA9730_PACKET_SIZE - 1));
-        dma_cache_wback_inv((unsigned long) Pa, mem_size);
+static int lan_saa9730_allocate_buffers(struct pci_dev *pdev,
+                                        struct lan_saa9730_private *lp)
+{
+        void *Pa;
+        unsigned int i, j, rxoffset, txoffset;
+        int ret;
 
         /* Initialize buffer space */
-        RcvBufferSize = LAN_SAA9730_PACKET_SIZE;
-        TxmBufferSize = LAN_SAA9730_PACKET_SIZE;
         lp->DmaRcvPackets = LAN_SAA9730_RCV_Q_SIZE;
         lp->DmaTxmPackets = LAN_SAA9730_TXM_Q_SIZE;
 
+        /* Initialize Rx Buffer Index */
+        lp->NextRcvPacketIndex = 0;
+        lp->NextRcvBufferIndex = 0;
+
+        /* Set current buffer index & next available packet index */
+        lp->NextTxmPacketIndex = 0;
+        lp->NextTxmBufferIndex = 0;
+        lp->PendingTxmPacketIndex = 0;
+        lp->PendingTxmBufferIndex = 0;
+
+        /*
+         * Allocate all RX and TX packets in one chunk.
+         * The Rx and Tx packets must be PACKET_SIZE aligned.
+         */
+        lp->buffer_size = ((LAN_SAA9730_RCV_Q_SIZE + LAN_SAA9730_TXM_Q_SIZE) *
+                           LAN_SAA9730_PACKET_SIZE * LAN_SAA9730_BUFFERS) +
+                          LAN_SAA9730_PACKET_SIZE;
+        lp->buffer_start = pci_alloc_consistent(pdev, lp->buffer_size,
+                                                &lp->dma_addr);
+        if (!lp->buffer_start) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        Pa = (void *)ALIGN((unsigned long)lp->buffer_start,
+                           LAN_SAA9730_PACKET_SIZE);
+
+        rxoffset = Pa - lp->buffer_start;
+
         /* Init RX buffers */
         for (i = 0; i < LAN_SAA9730_BUFFERS; i++) {
                 for (j = 0; j < LAN_SAA9730_RCV_Q_SIZE; j++) {
                         *(unsigned int *) Pa =
                             cpu_to_le32(RXSF_READY <<
                                         RX_STAT_CTL_OWNER_SHF);
-                        lp->RcvBuffer[i][j] = (unsigned int) Pa;
-                        Pa += RcvBufferSize;
+                        lp->RcvBuffer[i][j] = Pa;
+                        Pa += LAN_SAA9730_PACKET_SIZE;
                 }
         }
 
+        txoffset = Pa - lp->buffer_start;
+
         /* Init TX buffers */
         for (i = 0; i < LAN_SAA9730_BUFFERS; i++) {
                 for (j = 0; j < LAN_SAA9730_TXM_Q_SIZE; j++) {
                         *(unsigned int *) Pa =
                             cpu_to_le32(TXSF_EMPTY <<
                                         TX_STAT_CTL_OWNER_SHF);
-                        lp->TxmBuffer[i][j] = (unsigned int) Pa;
-                        Pa += TxmBufferSize;
+                        lp->TxmBuffer[i][j] = Pa;
+                        Pa += LAN_SAA9730_PACKET_SIZE;
                 }
         }
 
-        /* 
-         * Set rx buffer A and rx buffer B to point to the first two buffer 
+        /*
+         * Set rx buffer A and rx buffer B to point to the first two buffer
          * spaces.
          */
-        OUTL(PHYSADDR(lp->RcvBuffer[0][0]),
+        outl(lp->dma_addr + rxoffset,
              &lp->lan_saa9730_regs->RxBuffA);
-        OUTL(PHYSADDR(lp->RcvBuffer[1][0]),
+        outl(lp->dma_addr + rxoffset +
+             LAN_SAA9730_PACKET_SIZE * LAN_SAA9730_RCV_Q_SIZE,
              &lp->lan_saa9730_regs->RxBuffB);
 
-        /* Initialize Buffer Index */
-        lp->NextRcvPacketIndex = 0;
-        lp->NextRcvToUseIsA = 1;
-
-        /* Set current buffer index & next availble packet index */
-        lp->NextTxmPacketIndex = 0;
-        lp->NextTxmBufferIndex = 0;
-        lp->PendingTxmPacketIndex = 0;
-        lp->PendingTxmBufferIndex = 0;
-
-        /* 
+        /*
          * Set txm_buf_a and txm_buf_b to point to the first two buffer
-         * space 
+         * space
          */
-        OUTL(PHYSADDR(lp->TxmBuffer[0][0]),
+        outl(lp->dma_addr + txoffset,
              &lp->lan_saa9730_regs->TxBuffA);
-        OUTL(PHYSADDR(lp->TxmBuffer[1][0]),
+        outl(lp->dma_addr + txoffset +
+             LAN_SAA9730_PACKET_SIZE * LAN_SAA9730_TXM_Q_SIZE,
              &lp->lan_saa9730_regs->TxBuffB);
 
         /* Set packet number */
-        OUTL((lp->DmaRcvPackets << PK_COUNT_RX_A_SHF) |
+        outl((lp->DmaRcvPackets << PK_COUNT_RX_A_SHF) |
              (lp->DmaRcvPackets << PK_COUNT_RX_B_SHF) |
              (lp->DmaTxmPackets << PK_COUNT_TX_A_SHF) |
              (lp->DmaTxmPackets << PK_COUNT_TX_B_SHF),
              &lp->lan_saa9730_regs->PacketCount);
 
         return 0;
+
+out:
+        return ret;
 }
 
 static int lan_saa9730_cam_load(struct lan_saa9730_private *lp)
@@ -317,8 +326,8 @@ static int lan_saa9730_cam_load(struct lan_saa9730_private *lp)
 
         for (i = 0; i < LAN_SAA9730_CAM_DWORDS; i++) {
                 /* First set address to where data is written */
-                OUTL(i, &lp->lan_saa9730_regs->CamAddress);
-                OUTL((NetworkAddress[0] << 24) | (NetworkAddress[1] << 16)
+                outl(i, &lp->lan_saa9730_regs->CamAddress);
+                outl((NetworkAddress[0] << 24) | (NetworkAddress[1] << 16)
                      | (NetworkAddress[2] << 8) | NetworkAddress[3],
                      &lp->lan_saa9730_regs->CamData);
                 NetworkAddress += 4;
@@ -328,8 +337,7 @@ static int lan_saa9730_cam_load(struct lan_saa9730_private *lp)
 
 static int lan_saa9730_cam_init(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
         unsigned int i;
 
         /* Copy MAC-address into all entries. */
@@ -347,7 +355,7 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
 
         /* Check link status, spin here till station is not busy. */
         i = 0;
-        while (INL(&lp->lan_saa9730_regs->StationMgmtCtl) & MD_CA_BUSY) {
+        while (readl(&lp->lan_saa9730_regs->StationMgmtCtl) & MD_CA_BUSY) {
                 i++;
                 if (i > 100) {
                         printk("Error: lan_saa9730_mii_init: timeout\n");
@@ -357,12 +365,12 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
         }
 
         /* Now set the control and address register. */
-        OUTL(MD_CA_BUSY | PHY_STATUS | PHY_ADDRESS << MD_CA_PHY_SHF,
+        outl(MD_CA_BUSY | PHY_STATUS | PHY_ADDRESS << MD_CA_PHY_SHF,
              &lp->lan_saa9730_regs->StationMgmtCtl);
 
         /* check link status, spin here till station is not busy */
         i = 0;
-        while (INL(&lp->lan_saa9730_regs->StationMgmtCtl) & MD_CA_BUSY) {
+        while (readl(&lp->lan_saa9730_regs->StationMgmtCtl) & MD_CA_BUSY) {
                 i++;
                 if (i > 100) {
                         printk("Error: lan_saa9730_mii_init: timeout\n");
@@ -375,7 +383,7 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
         mdelay(1);
 
         /* Check the link status. */
-        if (INL(&lp->lan_saa9730_regs->StationMgmtData) &
+        if (readl(&lp->lan_saa9730_regs->StationMgmtData) &
             PHY_STATUS_LINK_UP) {
                 /* Link is up. */
                 return 0;
@@ -383,14 +391,14 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
                 /* Link is down, reset the PHY first. */
 
                 /* set PHY address = 'CONTROL' */
-                OUTL(PHY_ADDRESS << MD_CA_PHY_SHF | MD_CA_WR | PHY_CONTROL,
+                outl(PHY_ADDRESS << MD_CA_PHY_SHF | MD_CA_WR | PHY_CONTROL,
                      &lp->lan_saa9730_regs->StationMgmtCtl);
 
                 /* Wait for 1 ms. */
                 mdelay(1);
 
                 /* set 'CONTROL' = force reset and renegotiate */
-                OUTL(PHY_CONTROL_RESET | PHY_CONTROL_AUTO_NEG |
+                outl(PHY_CONTROL_RESET | PHY_CONTROL_AUTO_NEG |
                      PHY_CONTROL_RESTART_AUTO_NEG,
                      &lp->lan_saa9730_regs->StationMgmtData);
 
@@ -398,12 +406,12 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
                 mdelay(50);
 
                 /* set 'BUSY' to start operation */
-                OUTL(MD_CA_BUSY | PHY_ADDRESS << MD_CA_PHY_SHF | MD_CA_WR |
+                outl(MD_CA_BUSY | PHY_ADDRESS << MD_CA_PHY_SHF | MD_CA_WR |
                      PHY_CONTROL, &lp->lan_saa9730_regs->StationMgmtCtl);
 
                 /* await completion */
                 i = 0;
-                while (INL(&lp->lan_saa9730_regs->StationMgmtCtl) &
+                while (readl(&lp->lan_saa9730_regs->StationMgmtCtl) &
                        MD_CA_BUSY) {
                         i++;
                         if (i > 100) {
@@ -419,13 +427,13 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
 
                 for (l = 0; l < 2; l++) {
                         /* set PHY address = 'STATUS' */
-                        OUTL(MD_CA_BUSY | PHY_ADDRESS << MD_CA_PHY_SHF |
+                        outl(MD_CA_BUSY | PHY_ADDRESS << MD_CA_PHY_SHF |
                              PHY_STATUS,
                              &lp->lan_saa9730_regs->StationMgmtCtl);
 
                         /* await completion */
                         i = 0;
-                        while (INL(&lp->lan_saa9730_regs->StationMgmtCtl) &
+                        while (readl(&lp->lan_saa9730_regs->StationMgmtCtl) &
                                MD_CA_BUSY) {
                                 i++;
                                 if (i > 100) {
@@ -440,7 +448,7 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
                         mdelay(3000);
 
                         /* check the link status */
-                        if (INL(&lp->lan_saa9730_regs->StationMgmtData) &
+                        if (readl(&lp->lan_saa9730_regs->StationMgmtData) &
                             PHY_STATUS_LINK_UP) {
                                 /* link is up */
                                 break;
@@ -454,7 +462,7 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
 static int lan_saa9730_control_init(struct lan_saa9730_private *lp)
 {
         /* Initialize DMA control register. */
-        OUTL((LANMB_ANY << DMA_CTL_MAX_XFER_SHF) |
+        outl((LANMB_ANY << DMA_CTL_MAX_XFER_SHF) |
              (LANEND_LITTLE << DMA_CTL_ENDIAN_SHF) |
              (LAN_SAA9730_RCV_Q_INT_THRESHOLD << DMA_CTL_RX_INT_COUNT_SHF)
              | DMA_CTL_RX_INT_TO_EN | DMA_CTL_RX_INT_EN |
@@ -462,27 +470,27 @@ static int lan_saa9730_control_init(struct lan_saa9730_private *lp)
              &lp->lan_saa9730_regs->LanDmaCtl);
 
         /* Initial MAC control register. */
-        OUTL((MACCM_MII << MAC_CONTROL_CONN_SHF) | MAC_CONTROL_FULL_DUP,
+        outl((MACCM_MII << MAC_CONTROL_CONN_SHF) | MAC_CONTROL_FULL_DUP,
              &lp->lan_saa9730_regs->MacCtl);
 
         /* Initialize CAM control register. */
-        OUTL(CAM_CONTROL_COMP_EN | CAM_CONTROL_BROAD_ACC,
+        outl(CAM_CONTROL_COMP_EN | CAM_CONTROL_BROAD_ACC,
              &lp->lan_saa9730_regs->CamCtl);
 
-        /* 
+        /*
          * Initialize CAM enable register, only turn on first entry, should
-         * contain own addr. 
+         * contain own addr.
          */
-        OUTL(0x0001, &lp->lan_saa9730_regs->CamEnable);
+        outl(0x0001, &lp->lan_saa9730_regs->CamEnable);
 
         /* Initialize Tx control register */
-        OUTL(TX_CTL_EN_COMP, &lp->lan_saa9730_regs->TxCtl);
+        outl(TX_CTL_EN_COMP, &lp->lan_saa9730_regs->TxCtl);
 
         /* Initialize Rcv control register */
-        OUTL(RX_CTL_STRIP_CRC, &lp->lan_saa9730_regs->RxCtl);
+        outl(RX_CTL_STRIP_CRC, &lp->lan_saa9730_regs->RxCtl);
 
         /* Reset DMA engine */
-        OUTL(DMA_TEST_SW_RESET, &lp->lan_saa9730_regs->DmaTest);
+        outl(DMA_TEST_SW_RESET, &lp->lan_saa9730_regs->DmaTest);
 
         return 0;
 }
@@ -492,21 +500,21 @@ static int lan_saa9730_stop(struct lan_saa9730_private *lp)
         int i;
 
         /* Stop DMA first */
-        OUTL(INL(&lp->lan_saa9730_regs->LanDmaCtl) &
+        outl(readl(&lp->lan_saa9730_regs->LanDmaCtl) &
              ~(DMA_CTL_EN_TX_DMA | DMA_CTL_EN_RX_DMA),
              &lp->lan_saa9730_regs->LanDmaCtl);
 
         /* Set the SW Reset bits in DMA and MAC control registers */
-        OUTL(DMA_TEST_SW_RESET, &lp->lan_saa9730_regs->DmaTest);
-        OUTL(INL(&lp->lan_saa9730_regs->MacCtl) | MAC_CONTROL_RESET,
+        outl(DMA_TEST_SW_RESET, &lp->lan_saa9730_regs->DmaTest);
+        outl(readl(&lp->lan_saa9730_regs->MacCtl) | MAC_CONTROL_RESET,
              &lp->lan_saa9730_regs->MacCtl);
 
-        /* 
+        /*
          * Wait for MAC reset to have finished. The reset bit is auto cleared
          * when the reset is done.
          */
         i = 0;
-        while (INL(&lp->lan_saa9730_regs->MacCtl) & MAC_CONTROL_RESET) {
+        while (readl(&lp->lan_saa9730_regs->MacCtl) & MAC_CONTROL_RESET) {
                 i++;
                 if (i > 100) {
                         printk
@@ -524,7 +532,7 @@ static int lan_saa9730_dma_init(struct lan_saa9730_private *lp)
         /* Stop lan controller. */
         lan_saa9730_stop(lp);
 
-        OUTL(LAN_SAA9730_DEFAULT_TIME_OUT_CNT,
+        outl(LAN_SAA9730_DEFAULT_TIME_OUT_CNT,
              &lp->lan_saa9730_regs->Timeout);
 
         return 0;
@@ -536,28 +544,27 @@ static int lan_saa9730_start(struct lan_saa9730_private *lp)
 
         /* Initialize Rx Buffer Index */
         lp->NextRcvPacketIndex = 0;
-        lp->NextRcvToUseIsA = 1;
+        lp->NextRcvBufferIndex = 0;
 
-        /* Set current buffer index & next availble packet index */
+        /* Set current buffer index & next available packet index */
         lp->NextTxmPacketIndex = 0;
         lp->NextTxmBufferIndex = 0;
         lp->PendingTxmPacketIndex = 0;
         lp->PendingTxmBufferIndex = 0;
 
-        OUTL(INL(&lp->lan_saa9730_regs->LanDmaCtl) | DMA_CTL_EN_TX_DMA |
+        outl(readl(&lp->lan_saa9730_regs->LanDmaCtl) | DMA_CTL_EN_TX_DMA |
              DMA_CTL_EN_RX_DMA, &lp->lan_saa9730_regs->LanDmaCtl);
 
         /* For Tx, turn on MAC then DMA */
-        OUTL(INL(&lp->lan_saa9730_regs->TxCtl) | TX_CTL_TX_EN,
+        outl(readl(&lp->lan_saa9730_regs->TxCtl) | TX_CTL_TX_EN,
              &lp->lan_saa9730_regs->TxCtl);
 
         /* For Rx, turn on DMA then MAC */
-        OUTL(INL(&lp->lan_saa9730_regs->RxCtl) | RX_CTL_RX_EN,
+        outl(readl(&lp->lan_saa9730_regs->RxCtl) | RX_CTL_RX_EN,
              &lp->lan_saa9730_regs->RxCtl);
 
-        /* Set Ok2Use to let hardware owns the buffers */
-        OUTL(OK2USE_RX_A | OK2USE_RX_B | OK2USE_TX_A | OK2USE_TX_B,
-             &lp->lan_saa9730_regs->Ok2Use);
+        /* Set Ok2Use to let hardware own the buffers.  */
+        outl(OK2USE_RX_A | OK2USE_RX_B, &lp->lan_saa9730_regs->Ok2Use);
 
         return 0;
 }
@@ -572,8 +579,7 @@ static int lan_saa9730_restart(struct lan_saa9730_private *lp)
 
 static int lan_saa9730_tx(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
         unsigned int *pPacket;
         unsigned int tx_status;
 
@@ -581,13 +587,11 @@ static int lan_saa9730_tx(struct net_device *dev)
                 printk("lan_saa9730_tx interrupt\n");
 
         /* Clear interrupt. */
-        OUTL(DMA_STATUS_MAC_TX_INT, &lp->lan_saa9730_regs->DmaStatus);
+        outl(DMA_STATUS_MAC_TX_INT, &lp->lan_saa9730_regs->DmaStatus);
 
         while (1) {
-                pPacket =
-                    (unsigned int *) lp->TxmBuffer[lp->
-                                                   PendingTxmBufferIndex]
-                    [lp->PendingTxmPacketIndex];
+                pPacket = lp->TxmBuffer[lp->PendingTxmBufferIndex]
+                                       [lp->PendingTxmPacketIndex];
 
                 /* Get status of first packet transmitted. */
                 tx_status = le32_to_cpu(*pPacket);
@@ -605,23 +609,22 @@ static int lan_saa9730_tx(struct net_device *dev)
                         lp->stats.tx_errors++;
                         if (tx_status &
                             (TX_STATUS_EX_COLL << TX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.tx_aborted_errors++;
+                                lp->stats.tx_aborted_errors++;
                         if (tx_status &
-                            (TX_STATUS_LATE_COLL <<
-                             TX_STAT_CTL_STATUS_SHF)) lp->stats.
-             tx_window_errors++;
+                            (TX_STATUS_LATE_COLL << TX_STAT_CTL_STATUS_SHF))
+                                lp->stats.tx_window_errors++;
                         if (tx_status &
                             (TX_STATUS_L_CARR << TX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.tx_carrier_errors++;
+                                lp->stats.tx_carrier_errors++;
                         if (tx_status &
                             (TX_STATUS_UNDER << TX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.tx_fifo_errors++;
+                                lp->stats.tx_fifo_errors++;
                         if (tx_status &
                             (TX_STATUS_SQ_ERR << TX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.tx_heartbeat_errors++;
+                                lp->stats.tx_heartbeat_errors++;
 
                         lp->stats.collisions +=
-                            tx_status & TX_STATUS_TX_COLL_MSK;
+                                tx_status & TX_STATUS_TX_COLL_MSK;
                 }
 
                 /* Free buffer. */
@@ -636,21 +639,15 @@ static int lan_saa9730_tx(struct net_device *dev)
                 }
         }
 
-        /* Make sure A and B are available to hardware. */
-        OUTL(OK2USE_TX_A | OK2USE_TX_B, &lp->lan_saa9730_regs->Ok2Use);
-
-        if (netif_queue_stopped(dev)) {
-                /* The tx buffer is no longer full. */
-                netif_wake_queue(dev);
-        }
+        /* The tx buffer is no longer full. */
+        netif_wake_queue(dev);
 
         return 0;
 }
 
 static int lan_saa9730_rx(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
         int len = 0;
         struct sk_buff *skb = 0;
         unsigned int rx_status;
@@ -663,16 +660,13 @@ static int lan_saa9730_rx(struct net_device *dev)
                 printk("lan_saa9730_rx interrupt\n");
 
         /* Clear receive interrupts. */
-        OUTL(DMA_STATUS_MAC_RX_INT | DMA_STATUS_RX_INT |
+        outl(DMA_STATUS_MAC_RX_INT | DMA_STATUS_RX_INT |
              DMA_STATUS_RX_TO_INT, &lp->lan_saa9730_regs->DmaStatus);
 
         /* Address next packet */
-        if (lp->NextRcvToUseIsA)
-                BufferIndex = 0;
-        else
-                BufferIndex = 1;
+        BufferIndex = lp->NextRcvBufferIndex;
         PacketIndex = lp->NextRcvPacketIndex;
-        pPacket = (unsigned int *) lp->RcvBuffer[BufferIndex][PacketIndex];
+        pPacket = lp->RcvBuffer[BufferIndex][PacketIndex];
         rx_status = le32_to_cpu(*pPacket);
 
         /* Process each packet. */
@@ -715,51 +709,39 @@ static int lan_saa9730_rx(struct net_device *dev)
                         lp->stats.rx_errors++;
                         if (rx_status &
                             (RX_STATUS_CRC_ERR << RX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.rx_crc_errors++;
+                                lp->stats.rx_crc_errors++;
                         if (rx_status &
-                            (RX_STATUS_ALIGN_ERR <<
-                             RX_STAT_CTL_STATUS_SHF)) lp->stats.
-             rx_frame_errors++;
+                            (RX_STATUS_ALIGN_ERR << RX_STAT_CTL_STATUS_SHF))
+                                lp->stats.rx_frame_errors++;
                         if (rx_status &
                             (RX_STATUS_OVERFLOW << RX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.rx_fifo_errors++;
+                                lp->stats.rx_fifo_errors++;
                         if (rx_status &
                             (RX_STATUS_LONG_ERR << RX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.rx_length_errors++;
+                                lp->stats.rx_length_errors++;
                 }
 
                 /* Indicate we have processed the buffer. */
-                *pPacket =
-                    cpu_to_le32(RXSF_READY << RX_STAT_CTL_OWNER_SHF);
+                *pPacket = cpu_to_le32(RXSF_READY << RX_STAT_CTL_OWNER_SHF);
+
+                /* Make sure A or B is available to hardware as appropriate. */
+                outl(BufferIndex ? OK2USE_RX_B : OK2USE_RX_A,
+                     &lp->lan_saa9730_regs->Ok2Use);
 
                 /* Go to next packet in sequence. */
                 lp->NextRcvPacketIndex++;
                 if (lp->NextRcvPacketIndex >= LAN_SAA9730_RCV_Q_SIZE) {
                         lp->NextRcvPacketIndex = 0;
-                        if (BufferIndex) {
-                                lp->NextRcvToUseIsA = 1;
-                        } else {
-                                lp->NextRcvToUseIsA = 0;
-                        }
+                        lp->NextRcvBufferIndex ^= 1;
                 }
-                OUTL(OK2USE_RX_A | OK2USE_RX_B,
-                     &lp->lan_saa9730_regs->Ok2Use);
 
                 /* Address next packet */
-                if (lp->NextRcvToUseIsA)
-                        BufferIndex = 0;
-                else
-                        BufferIndex = 1;
+                BufferIndex = lp->NextRcvBufferIndex;
                 PacketIndex = lp->NextRcvPacketIndex;
-                pPacket =
-                    (unsigned int *) lp->
-                    RcvBuffer[BufferIndex][PacketIndex];
+                pPacket = lp->RcvBuffer[BufferIndex][PacketIndex];
                 rx_status = le32_to_cpu(*pPacket);
         }
 
-        /* Make sure A and B are available to hardware. */
-        OUTL(OK2USE_RX_A | OK2USE_RX_B, &lp->lan_saa9730_regs->Ok2Use);
-
         return 0;
 }
 
@@ -767,8 +749,7 @@ static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id,
                                   struct pt_regs *regs)
 {
         struct net_device *dev = (struct net_device *) dev_id;
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         if (lan_saa9730_debug > 5)
                 printk("lan_saa9730_interrupt\n");
@@ -780,11 +761,11 @@ static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id,
         evm_saa9730_clear_lan_int(lp);
 
         /* Service pending transmit interrupts. */
-        if (INL(&lp->lan_saa9730_regs->DmaStatus) & DMA_STATUS_MAC_TX_INT)
+        if (readl(&lp->lan_saa9730_regs->DmaStatus) & DMA_STATUS_MAC_TX_INT)
                 lan_saa9730_tx(dev);
 
         /* Service pending receive interrupts. */
-        if (INL(&lp->lan_saa9730_regs->DmaStatus) &
+        if (readl(&lp->lan_saa9730_regs->DmaStatus) &
             (DMA_STATUS_MAC_RX_INT | DMA_STATUS_RX_INT |
              DMA_STATUS_RX_TO_INT)) lan_saa9730_rx(dev);
 
@@ -794,15 +775,9 @@ static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id,
         return IRQ_HANDLED;
 }
 
-static int lan_saa9730_open_fail(struct net_device *dev)
-{
-        return -ENODEV;
-}
-
 static int lan_saa9730_open(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         /* Associate IRQ with lan_saa9730_interrupt */
         if (request_irq(dev->irq, &lan_saa9730_interrupt, 0, "SAA9730 Eth",
@@ -834,15 +809,13 @@ static int lan_saa9730_write(struct lan_saa9730_private *lp,
         int PacketIndex;
 
         if (lan_saa9730_debug > 5)
-                printk("lan_saa9730_write: skb=%08x\n",
-                       (unsigned int) skb);
+                printk("lan_saa9730_write: skb=%p\n", skb);
 
         BufferIndex = lp->NextTxmBufferIndex;
         PacketIndex = lp->NextTxmPacketIndex;
 
-        tx_status =
-            le32_to_cpu(*(unsigned int *) lp->
-                        TxmBuffer[BufferIndex][PacketIndex]);
+        tx_status = le32_to_cpu(*(unsigned int *)lp->TxmBuffer[BufferIndex]
+                                                              [PacketIndex]);
         if ((tx_status & TX_STAT_CTL_OWNER_MSK) !=
             (TXSF_EMPTY << TX_STAT_CTL_OWNER_SHF)) {
                 if (lan_saa9730_debug > 4)
@@ -858,29 +831,29 @@ static int lan_saa9730_write(struct lan_saa9730_private *lp,
                 lp->NextTxmBufferIndex ^= 1;
         }
 
-        pbPacketData =
-            (unsigned char *) lp->TxmBuffer[BufferIndex][PacketIndex];
+        pbPacketData = lp->TxmBuffer[BufferIndex][PacketIndex];
         pbPacketData += 4;
 
         /* copy the bits */
         memcpy(pbPacketData, pbData, len);
 
         /* Set transmit status for hardware */
-        *(unsigned int *) lp->TxmBuffer[BufferIndex][PacketIndex] =
-            cpu_to_le32((TXSF_READY << TX_STAT_CTL_OWNER_SHF) |
-                        (TX_STAT_CTL_INT_AFTER_TX << TX_STAT_CTL_FRAME_SHF)
-                        | (len << TX_STAT_CTL_LENGTH_SHF));
-
-        /* Set hardware tx buffer. */
-        OUTL(OK2USE_TX_A | OK2USE_TX_B, &lp->lan_saa9730_regs->Ok2Use);
+        *(unsigned int *)lp->TxmBuffer[BufferIndex][PacketIndex] =
+                cpu_to_le32((TXSF_READY << TX_STAT_CTL_OWNER_SHF) |
+                            (TX_STAT_CTL_INT_AFTER_TX <<
+                             TX_STAT_CTL_FRAME_SHF) |
+                            (len << TX_STAT_CTL_LENGTH_SHF));
+
+        /* Make sure A or B is available to hardware as appropriate. */
+        outl(BufferIndex ? OK2USE_TX_B : OK2USE_TX_A,
+             &lp->lan_saa9730_regs->Ok2Use);
 
         return 0;
 }
 
 static void lan_saa9730_tx_timeout(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         /* Transmitter timeout, serious problems */
         lp->stats.tx_errors++;
@@ -889,20 +862,19 @@ static void lan_saa9730_tx_timeout(struct net_device *dev)
         lan_saa9730_restart(lp);
 
         dev->trans_start = jiffies;
-        netif_start_queue(dev);
+        netif_wake_queue(dev);
 }
 
 static int lan_saa9730_start_xmit(struct sk_buff *skb,
                                   struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
         unsigned long flags;
         int skblen;
         int len;
 
         if (lan_saa9730_debug > 4)
-                printk("Send packet: skb=%08x\n", (unsigned int) skb);
+                printk("Send packet: skb=%p\n", skb);
 
         skblen = skb->len;
 
@@ -912,8 +884,7 @@ static int lan_saa9730_start_xmit(struct sk_buff *skb,
 
         if (lan_saa9730_write(lp, skb, skblen)) {
                 spin_unlock_irqrestore(&lp->lock, flags);
-                printk("Error when writing packet to controller: skb=%08x\n",
-                     (unsigned int) skb);
+                printk("Error when writing packet to controller: skb=%p\n", skb);
                 netif_stop_queue(dev);
                 return -1;
         }
@@ -922,7 +893,7 @@ static int lan_saa9730_start_xmit(struct sk_buff *skb,
         lp->stats.tx_packets++;
 
         dev->trans_start = jiffies;
-        netif_start_queue(dev);
+        netif_wake_queue(dev);
         dev_kfree_skb(skb);
 
         spin_unlock_irqrestore(&lp->lock, flags);
@@ -932,8 +903,7 @@ static int lan_saa9730_start_xmit(struct sk_buff *skb,
 
 static int lan_saa9730_close(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         if (lan_saa9730_debug > 1)
                 printk("lan_saa9730_close:\n");
@@ -955,33 +925,31 @@ static int lan_saa9730_close(struct net_device *dev)
 static struct net_device_stats *lan_saa9730_get_stats(struct net_device
                                                       *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         return &lp->stats;
 }
 
 static void lan_saa9730_set_multicast(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         /* Stop the controller */
         lan_saa9730_stop(lp);
 
         if (dev->flags & IFF_PROMISC) {
                 /* accept all packets */
-                OUTL(CAM_CONTROL_COMP_EN | CAM_CONTROL_STATION_ACC |
+                outl(CAM_CONTROL_COMP_EN | CAM_CONTROL_STATION_ACC |
                      CAM_CONTROL_GROUP_ACC | CAM_CONTROL_BROAD_ACC,
                      &lp->lan_saa9730_regs->CamCtl);
         } else {
                 if (dev->flags & IFF_ALLMULTI) {
                         /* accept all multicast packets */
-                        OUTL(CAM_CONTROL_COMP_EN | CAM_CONTROL_GROUP_ACC |
+                        outl(CAM_CONTROL_COMP_EN | CAM_CONTROL_GROUP_ACC |
                              CAM_CONTROL_BROAD_ACC,
                              &lp->lan_saa9730_regs->CamCtl);
                 } else {
-                        /* 
+                        /*
                          * Will handle the multicast stuff later. -carstenl
                          */
                 }
@@ -993,91 +961,86 @@ static void lan_saa9730_set_multicast(struct net_device *dev)
 
 static void __devexit saa9730_remove_one(struct pci_dev *pdev)
 {
-        struct net_device *dev = pci_get_drvdata(pdev);
-
-        if (dev) {
-                unregister_netdev(dev);
-                kfree(dev->priv);
-                free_netdev(dev);
-                pci_release_regions(pdev);
-                pci_disable_device(pdev);
-                pci_set_drvdata(pdev, NULL);
-        }
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct lan_saa9730_private *lp = netdev_priv(dev);
+
+        if (dev) {
+                unregister_netdev(dev);
+                lan_saa9730_free_buffers(pdev, lp);
+                iounmap(lp->lan_saa9730_regs);
+                iounmap(lp->evm_saa9730_regs);
+                free_netdev(dev);
+                pci_release_regions(pdev);
+                pci_disable_device(pdev);
+                pci_set_drvdata(pdev, NULL);
+        }
 }
 
 
-static int lan_saa9730_init(struct net_device *dev, int ioaddr, int irq)
+static int lan_saa9730_init(struct net_device *dev, struct pci_dev *pdev,
+        unsigned long ioaddr, int irq)
 {
-        struct lan_saa9730_private *lp;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
         unsigned char ethernet_addr[6];
-        int ret = 0;
+        int ret;
 
-        dev->open = lan_saa9730_open_fail;
+        if (get_ethernet_addr(ethernet_addr)) {
+                ret = -ENODEV;
+                goto out;
+        }
 
-        if (get_ethernet_addr(ethernet_addr))
-                return -ENODEV;
-        
         memcpy(dev->dev_addr, ethernet_addr, 6);
         dev->base_addr = ioaddr;
         dev->irq = irq;
-        
-        /* 
-         * Make certain the data structures used by the controller are aligned 
-         * and DMAble. 
-         */
-        /*
-         *  XXX: that is obviously broken - kfree() won't be happy with us.
-         */
-        lp = (struct lan_saa9730_private *) (((unsigned long)
-                                              kmalloc(sizeof(*lp) + 7,
-                                                      GFP_DMA | GFP_KERNEL)
-                                              + 7) & ~7);
 
-        if (!lp)
-                return -ENOMEM;
-
-        dev->priv = lp;
-        memset(lp, 0, sizeof(*lp));
+        lp->pci_dev = pdev;
 
         /* Set SAA9730 LAN base address. */
-        lp->lan_saa9730_regs = (t_lan_saa9730_regmap *) (ioaddr +
-                                                         SAA9730_LAN_REGS_ADDR);
+        lp->lan_saa9730_regs = ioremap(ioaddr + SAA9730_LAN_REGS_ADDR,
+                                       SAA9730_LAN_REGS_SIZE);
+        if (!lp->lan_saa9730_regs) {
+                ret = -ENOMEM;
+                goto out;
+        }
 
         /* Set SAA9730 EVM base address. */
-        lp->evm_saa9730_regs = (t_evm_saa9730_regmap *) (ioaddr +
-                                                         SAA9730_EVM_REGS_ADDR);
+        lp->evm_saa9730_regs = ioremap(ioaddr + SAA9730_EVM_REGS_ADDR,
+                                       SAA9730_EVM_REGS_SIZE);
+        if (!lp->evm_saa9730_regs) {
+                ret = -ENOMEM;
+                goto out_iounmap_lan;
+        }
 
         /* Allocate LAN RX/TX frame buffer space. */
-        /* FIXME: a leak */
-        if ((ret = lan_saa9730_allocate_buffers(lp)))
-                goto out;
+        if ((ret = lan_saa9730_allocate_buffers(pdev, lp)))
+                goto out_iounmap;
 
         /* Stop LAN controller. */
-        if ((ret = lan_saa9730_stop(lp))) 
-                goto out;
-        
+        if ((ret = lan_saa9730_stop(lp)))
+                goto out_free_consistent;
+
         /* Initialize CAM registers. */
         if ((ret = lan_saa9730_cam_init(dev)))
-                goto out;
+                goto out_free_consistent;
 
         /* Initialize MII registers. */
         if ((ret = lan_saa9730_mii_init(lp)))
-                goto out;
+                goto out_free_consistent;
 
         /* Initialize control registers. */
-        if ((ret = lan_saa9730_control_init(lp))) 
-                goto out;
-        
+        if ((ret = lan_saa9730_control_init(lp)))
+                goto out_free_consistent;
+
         /* Load CAM registers. */
-        if ((ret = lan_saa9730_cam_load(lp))) 
-                goto out;
-        
+        if ((ret = lan_saa9730_cam_load(lp)))
+                goto out_free_consistent;
+
         /* Initialize DMA context registers. */
         if ((ret = lan_saa9730_dma_init(lp)))
-                goto out;
-        
+                goto out_free_consistent;
+
         spin_lock_init(&lp->lock);
-                
+
         dev->open = lan_saa9730_open;
         dev->hard_start_xmit = lan_saa9730_start_xmit;
         dev->stop = lan_saa9730_close;
@@ -1086,44 +1049,43 @@ static int lan_saa9730_init(struct net_device *dev, int ioaddr, int irq)
         dev->tx_timeout = lan_saa9730_tx_timeout;
         dev->watchdog_timeo = (HZ >> 1);
         dev->dma = 0;
-        
-        ret = register_netdev(dev);
+
+        ret = register_netdev (dev);
         if (ret)
-                goto out;
+                goto out_free_consistent;
+
         return 0;
 
- out:
-        kfree(dev->priv);
+out_free_consistent:
+        lan_saa9730_free_buffers(pdev, lp);
+out_iounmap:
+        iounmap(lp->evm_saa9730_regs);
+out_iounmap_lan:
+        iounmap(lp->lan_saa9730_regs);
+out:
         return ret;
 }
 
 
 static int __devinit saa9730_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-        struct net_device *dev;
-        unsigned int pci_ioaddr;
+        struct net_device *dev = NULL;
+        unsigned long pci_ioaddr;
         int err;
 
         if (lan_saa9730_debug > 1)
                 printk("saa9730.c: PCI bios is present, checking for devices...\n");
 
-        err = -ENOMEM;
-        dev = alloc_etherdev(0);
-        if (!dev)
-                goto out;
-
-        SET_MODULE_OWNER(dev);
-
         err = pci_enable_device(pdev);
-        if (err) {
-                printk(KERN_ERR "Cannot enable PCI device, aborting.\n");
-                goto out1;
-        }
+        if (err) {
+                printk(KERN_ERR "Cannot enable PCI device, aborting.\n");
+                goto out;
+        }
 
         err = pci_request_regions(pdev, DRV_MODULE_NAME);
         if (err) {
                 printk(KERN_ERR "Cannot obtain PCI resources, aborting.\n");
-                goto out2;
+                goto out_disable_pdev;
         }
 
         pci_irq_line = pdev->irq;
@@ -1132,49 +1094,54 @@ static int __devinit saa9730_init_one(struct pci_dev *pdev, const struct pci_dev
         pci_ioaddr = pci_resource_start(pdev, 1);
         pci_set_master(pdev);
 
-        printk("Found SAA9730 (PCI) at %#x, irq %d.\n",
+        printk("Found SAA9730 (PCI) at %lx, irq %d.\n",
                pci_ioaddr, pci_irq_line);
 
-        err = lan_saa9730_init(dev, pci_ioaddr, pci_irq_line);
+        dev = alloc_etherdev(sizeof(struct lan_saa9730_private));
+        if (!dev)
+                goto out_disable_pdev;
+
+        err = lan_saa9730_init(dev, pdev, pci_ioaddr, pci_irq_line);
         if (err) {
-                printk("Lan init failed");
-                goto out2;
+                printk("LAN init failed");
+                goto out_free_netdev;
         }
 
         pci_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
         return 0;
-        
-out2:
-        pci_disable_device(pdev);
-out1:
+
+out_free_netdev:
         free_netdev(dev);
+out_disable_pdev:
+        pci_disable_device(pdev);
 out:
+        pci_set_drvdata(pdev, NULL);
         return err;
 }
 
 
 static struct pci_driver saa9730_driver = {
-        .name           = DRV_MODULE_NAME,
-        .id_table       = saa9730_pci_tbl,
-        .probe          = saa9730_init_one,
-        .remove         = __devexit_p(saa9730_remove_one),
+        .name           = DRV_MODULE_NAME,
+        .id_table       = saa9730_pci_tbl,
+        .probe          = saa9730_init_one,
+        .remove         = __devexit_p(saa9730_remove_one),
 };
 
 
 static int __init saa9730_init(void)
 {
-        return pci_module_init(&saa9730_driver);
+        return pci_module_init(&saa9730_driver);
 }
 
 static void __exit saa9730_cleanup(void)
 {
-        pci_unregister_driver(&saa9730_driver);
+        pci_unregister_driver(&saa9730_driver);
 }
 
 module_init(saa9730_init);
 module_exit(saa9730_cleanup);
 
-
-
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_DESCRIPTION("Philips SAA9730 ethernet driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 74d5f1a6fdea..c91e2e81f131 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2183,9 +2183,8 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device *
  *      0 --> there is a device
  *      anything else, error
  */
-static int smc_drv_probe(struct device *dev)
+static int smc_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct net_device *ndev;
         struct resource *res;
         unsigned int __iomem *addr;
@@ -2212,7 +2211,7 @@ static int smc_drv_probe(struct device *dev)
                 goto out_release_io;
         }
         SET_MODULE_OWNER(ndev);
-        SET_NETDEV_DEV(ndev, dev);
+        SET_NETDEV_DEV(ndev, &pdev->dev);
 
         ndev->dma = (unsigned char)-1;
         ndev->irq = platform_get_irq(pdev, 0);
@@ -2233,7 +2232,7 @@ static int smc_drv_probe(struct device *dev)
                 goto out_release_attrib;
         }
 
-        dev_set_drvdata(dev, ndev);
+        platform_set_drvdata(pdev, ndev);
         ret = smc_probe(ndev, addr);
         if (ret != 0)
                 goto out_iounmap;
@@ -2249,7 +2248,7 @@ static int smc_drv_probe(struct device *dev)
         return 0;
 
  out_iounmap:
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         iounmap(addr);
  out_release_attrib:
         smc_release_attrib(pdev);
@@ -2263,14 +2262,13 @@ static int smc_drv_probe(struct device *dev)
         return ret;
 }
 
-static int smc_drv_remove(struct device *dev)
+static int smc_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
         struct smc_local *lp = netdev_priv(ndev);
         struct resource *res;
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         unregister_netdev(ndev);
 
@@ -2295,9 +2293,9 @@ static int smc_drv_remove(struct device *dev)
         return 0;
 }
 
-static int smc_drv_suspend(struct device *dev, pm_message_t state)
+static int smc_drv_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(dev);
 
         if (ndev) {
                 if (netif_running(ndev)) {
@@ -2309,14 +2307,13 @@ static int smc_drv_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int smc_drv_resume(struct device *dev)
+static int smc_drv_resume(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(dev);
 
         if (ndev) {
                 struct smc_local *lp = netdev_priv(ndev);
-                smc_enable_device(pdev);
+                smc_enable_device(dev);
                 if (netif_running(ndev)) {
                         smc_reset(ndev);
                         smc_enable(ndev);
@@ -2328,13 +2325,14 @@ static int smc_drv_resume(struct device *dev)
         return 0;
 }
 
-static struct device_driver smc_driver = {
-        .name           = CARDNAME,
-        .bus            = &platform_bus_type,
+static struct platform_driver smc_driver = {
         .probe          = smc_drv_probe,
         .remove         = smc_drv_remove,
         .suspend        = smc_drv_suspend,
         .resume         = smc_drv_resume,
+        .driver         = {
+                .name   = CARDNAME,
+        },
 };
 
 static int __init smc_init(void)
@@ -2348,12 +2346,12 @@ static int __init smc_init(void)
 #endif
 #endif
 
-        return driver_register(&smc_driver);
+        return platform_driver_register(&smc_driver);
 }
 
 static void __exit smc_cleanup(void)
 {
-        driver_unregister(&smc_driver);
+        platform_driver_unregister(&smc_driver);
 }
 
 module_init(smc_init);
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 817f200742c3..a10cd184d597 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -289,6 +289,38 @@ static inline void SMC_outsw (unsigned long a, int r, unsigned char* p, int l)
 #define RPC_LSA_DEFAULT         RPC_LED_TX_RX
 #define RPC_LSB_DEFAULT         RPC_LED_100_10
 
+#elif defined(CONFIG_SOC_AU1X00)
+
+#include <au1xxx.h>
+
+/* We can only do 16-bit reads and writes in the static memory space. */
+#define SMC_CAN_USE_8BIT        0
+#define SMC_CAN_USE_16BIT       1
+#define SMC_CAN_USE_32BIT       0
+#define SMC_IO_SHIFT            0
+#define SMC_NOWAIT              1
+
+#define SMC_inw(a, r)           au_readw((unsigned long)((a) + (r)))
+#define SMC_insw(a, r, p, l)    \
+        do {    \
+                unsigned long _a = (unsigned long)((a) + (r)); \
+                int _l = (l); \
+                u16 *_p = (u16 *)(p); \
+                while (_l-- > 0) \
+                        *_p++ = au_readw(_a); \
+        } while(0)
+#define SMC_outw(v, a, r)       au_writew(v, (unsigned long)((a) + (r)))
+#define SMC_outsw(a, r, p, l)   \
+        do {    \
+                unsigned long _a = (unsigned long)((a) + (r)); \
+                int _l = (l); \
+                const u16 *_p = (const u16 *)(p); \
+                while (_l-- > 0) \
+                        au_writew(*_p++ , _a); \
+        } while(0)
+
+#define set_irq_type(irq, type) do {} while (0)
+
 #else
 
 #define SMC_CAN_USE_8BIT        1
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index c796f41b4a52..0d765f1733b5 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -2290,7 +2290,6 @@ spider_net_remove(struct pci_dev *pdev)
 }
 
 static struct pci_driver spider_net_driver = {
-        .owner          = THIS_MODULE,
         .name           = spider_net_driver_name,
         .id_table       = spider_net_pci_tbl,
         .probe          = spider_net_probe,
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index d04c918ebef8..4f756960db2a 100644
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -344,9 +344,10 @@ module_param_array(dma, int, NULL, 0);
 
 static struct platform_device *proteon_dev[ISATR_MAX_ADAPTERS];
 
-static struct device_driver proteon_driver = {
-        .name           = "proteon",
-        .bus            = &platform_bus_type,
+static struct platform_driver proteon_driver = {
+        .driver         = {
+                .name   = "proteon",
+        },
 };
 
 static int __init proteon_init(void)
@@ -355,7 +356,7 @@ static int __init proteon_init(void)
         struct platform_device *pdev;
         int i, num = 0, err = 0;
 
-        err = driver_register(&proteon_driver);
+        err = platform_driver_register(&proteon_driver);
         if (err)
                 return err;
 
@@ -372,7 +373,7 @@ static int __init proteon_init(void)
                 err = setup_card(dev, &pdev->dev);
                 if (!err) {
                         proteon_dev[i] = pdev;
-                        dev_set_drvdata(&pdev->dev, dev);
+                        platform_set_drvdata(pdev, dev);
                         ++num;
                 } else {
                         platform_device_unregister(pdev);
@@ -399,17 +400,17 @@ static void __exit proteon_cleanup(void)
                 
                 if (!pdev)
                         continue;
-                dev = dev_get_drvdata(&pdev->dev);
+                dev = platform_get_drvdata(pdev);
                 unregister_netdev(dev);
                 release_region(dev->base_addr, PROTEON_IO_EXTENT);
                 free_irq(dev->irq, dev);
                 free_dma(dev->dma);
                 tmsdev_term(dev);
                 free_netdev(dev);
-                dev_set_drvdata(&pdev->dev, NULL);
+                platform_set_drvdata(pdev, NULL);
                 platform_device_unregister(pdev);
         }
-        driver_unregister(&proteon_driver);
+        platform_driver_unregister(&proteon_driver);
 }
 
 module_init(proteon_init);
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index 72cf708396be..d6ba41cf3110 100644
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -354,9 +354,10 @@ module_param_array(dma, int, NULL, 0);
 
 static struct platform_device *sk_isa_dev[ISATR_MAX_ADAPTERS];
 
-static struct device_driver sk_isa_driver = {
-        .name           = "skisa",
-        .bus            = &platform_bus_type,
+static struct platform_driver sk_isa_driver = {
+        .driver         = {
+                .name   = "skisa",
+        },
 };
 
 static int __init sk_isa_init(void)
@@ -365,7 +366,7 @@ static int __init sk_isa_init(void)
         struct platform_device *pdev;
         int i, num = 0, err = 0;
 
-        err = driver_register(&sk_isa_driver);
+        err = platform_driver_register(&sk_isa_driver);
         if (err)
                 return err;
 
@@ -382,7 +383,7 @@ static int __init sk_isa_init(void)
                 err = setup_card(dev, &pdev->dev);
                 if (!err) {
                         sk_isa_dev[i] = pdev;
-                        dev_set_drvdata(&sk_isa_dev[i]->dev, dev);
+                        platform_set_drvdata(sk_isa_dev[i], dev);
                         ++num;
                 } else {
                         platform_device_unregister(pdev);
@@ -409,17 +410,17 @@ static void __exit sk_isa_cleanup(void)
 
                 if (!pdev)
                         continue;
-                dev = dev_get_drvdata(&pdev->dev);
+                dev = platform_get_drvdata(pdev);
                 unregister_netdev(dev);
                 release_region(dev->base_addr, SK_ISA_IO_EXTENT);
                 free_irq(dev->irq, dev);
                 free_dma(dev->dma);
                 tmsdev_term(dev);
                 free_netdev(dev);
-                dev_set_drvdata(&pdev->dev, NULL);
+                platform_set_drvdata(pdev, NULL);
                 platform_device_unregister(pdev);
         }
-        driver_unregister(&sk_isa_driver);
+        platform_driver_unregister(&sk_isa_driver);
 }
 
 module_init(sk_isa_init);
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 7187958e40ca..00e55165b760 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -330,7 +330,7 @@ config PCI_HERMES
 
 config ATMEL
       tristate "Atmel at76c50x chipset  802.11b support"
-      depends on NET_RADIO && EXPERIMENTAL
+      depends on NET_RADIO
       select FW_LOADER
       select CRC32
        ---help---
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index a3e23527fe7f..5e53c5258a33 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -72,7 +72,7 @@
 #include "atmel.h"
 
 #define DRIVER_MAJOR 0
-#define DRIVER_MINOR 96
+#define DRIVER_MINOR 98
 
 MODULE_AUTHOR("Simon Kelley");
 MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.");
@@ -1504,7 +1504,7 @@ static int atmel_read_proc(char *page, char **start, off_t off,
         return len;
 }
 
-struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWType fw_type,  
+struct net_device *init_atmel_card( unsigned short irq, unsigned long port, const AtmelFWType fw_type,  
                                     struct device *sys_dev, int (*card_present)(void *), void *card)
 {
         struct net_device *dev;
@@ -1605,8 +1605,8 @@ struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWT
                 goto err_out_free;
         }
 
-        if (priv->bus_type == BUS_TYPE_PCI &&
-            !request_region( dev->base_addr, 64, dev->name )) {
+        if (!request_region(dev->base_addr, 32, 
+                            priv->bus_type == BUS_TYPE_PCCARD ?  "atmel_cs" : "atmel_pci")) {
                 goto err_out_irq;
         }
         
@@ -1622,15 +1622,16 @@ struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWT
         
         create_proc_read_entry ("driver/atmel", 0, NULL, atmel_read_proc, priv);        
         
-        printk(KERN_INFO "%s: Atmel at76c50x wireless. Version %d.%d simon@thekelleys.org.uk\n",
-               dev->name, DRIVER_MAJOR, DRIVER_MINOR);
+        printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
+               dev->name, DRIVER_MAJOR, DRIVER_MINOR,
+               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
         
         SET_MODULE_OWNER(dev);
         return dev;
         
  err_out_res:
-        if (priv->bus_type == BUS_TYPE_PCI)
-                release_region( dev->base_addr, 64 );
+        release_region( dev->base_addr, 32);
  err_out_irq:
         free_irq(dev->irq, dev);
  err_out_free:
@@ -1640,7 +1641,7 @@ struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWT
 
 EXPORT_SYMBOL(init_atmel_card);
 
-void stop_atmel_card(struct net_device *dev, int freeres)
+void stop_atmel_card(struct net_device *dev)
 {
         struct atmel_private *priv = netdev_priv(dev);
                 
@@ -1654,10 +1655,7 @@ void stop_atmel_card(struct net_device *dev, int freeres)
         remove_proc_entry("driver/atmel", NULL);
         free_irq(dev->irq, dev);
         kfree(priv->firmware);
-        if (freeres) {
-                /* PCMCIA frees this stuff, so only for PCI */
-                release_region(dev->base_addr, 64);
-        }
+        release_region(dev->base_addr, 32);
         free_netdev(dev);
 }
 
@@ -1810,9 +1808,9 @@ static int atmel_set_encode(struct net_device *dev,
         }
         if(dwrq->flags & IW_ENCODE_RESTRICTED)
                 priv->exclude_unencrypted = 1;
-        if(dwrq->flags & IW_ENCODE_OPEN)
+        if(dwrq->flags & IW_ENCODE_OPEN) 
                 priv->exclude_unencrypted = 0;
-        
+       
         return -EINPROGRESS;            /* Call commit handler */
 }
 
@@ -1827,11 +1825,12 @@ static int atmel_get_encode(struct net_device *dev,
         
         if (!priv->wep_is_on)
                 dwrq->flags = IW_ENCODE_DISABLED;
-        else if (priv->exclude_unencrypted)
-                dwrq->flags = IW_ENCODE_RESTRICTED;
-        else
-                dwrq->flags = IW_ENCODE_OPEN;
-                
+        else {
+                if (priv->exclude_unencrypted)
+                        dwrq->flags = IW_ENCODE_RESTRICTED;
+                else
+                        dwrq->flags = IW_ENCODE_OPEN;
+        }
                 /* Which key do we want ? -1 -> tx index */
         if (index < 0 || index >= 4)
                 index = priv->default_key;
@@ -2645,8 +2644,8 @@ static void handle_beacon_probe(struct atmel_private *priv, u16 capability, u8 c
         } 
 }
 
- 
-static void send_authentication_request(struct atmel_private *priv, u8 *challenge, int challenge_len)
+
+static void send_authentication_request(struct atmel_private *priv, u16 system, u8 *challenge, int challenge_len)
 {
         struct ieee80211_hdr_4addr header;
         struct auth_body auth;
@@ -2658,14 +2657,11 @@ static void send_authentication_request(struct atmel_private *priv, u8 *challeng
         memcpy(header.addr2, priv->dev->dev_addr, 6);
         memcpy(header.addr3, priv->CurrentBSSID, 6);
         
-        if (priv->wep_is_on) {
-                auth.alg = cpu_to_le16(C80211_MGMT_AAN_SHAREDKEY); 
+        if (priv->wep_is_on && priv->CurrentAuthentTransactionSeqNum != 1) 
                 /* no WEP for authentication frames with TrSeqNo 1 */
-                if (priv->CurrentAuthentTransactionSeqNum != 1)
-                        header.frame_ctl |=  cpu_to_le16(IEEE80211_FCTL_PROTECTED);
-        } else {
-                auth.alg = cpu_to_le16(C80211_MGMT_AAN_OPENSYSTEM);
-        }
+                header.frame_ctl |=  cpu_to_le16(IEEE80211_FCTL_PROTECTED);
+        
+        auth.alg = cpu_to_le16(system); 
 
         auth.status = 0;
         auth.trans_seq = cpu_to_le16(priv->CurrentAuthentTransactionSeqNum);
@@ -2834,6 +2830,7 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
         struct auth_body *auth = (struct auth_body *)priv->rx_buf;
         u16 status = le16_to_cpu(auth->status);
         u16 trans_seq_no = le16_to_cpu(auth->trans_seq);
+        u16 system = le16_to_cpu(auth->alg);
         
         if (status == C80211_MGMT_SC_Success && !priv->wep_is_on) { 
                 /* no WEP */
@@ -2855,7 +2852,7 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
                                 
                 if (trans_seq_no == 0x0002 &&
                     auth->el_id == C80211_MGMT_ElementID_ChallengeText) {
-                        send_authentication_request(priv, auth->chall_text, auth->chall_text_len);
+                        send_authentication_request(priv, system, auth->chall_text, auth->chall_text_len);
                         return;
                 }
                 
@@ -2872,14 +2869,20 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
                 }
         }                       
         
-        if (status == C80211_MGMT_SC_AuthAlgNotSupported && priv->connect_to_any_BSS) {
-                int bss_index;
-                
-                priv->BSSinfo[(int)(priv->current_BSS)].channel |= 0x80;
-                
-                if ((bss_index  = retrieve_bss(priv)) != -1) {
-                        atmel_join_bss(priv, bss_index);
-                        return;
+        if (status == C80211_MGMT_SC_AuthAlgNotSupported) {
+                /* Do opensystem first, then try sharedkey */
+                if (system ==  C80211_MGMT_AAN_OPENSYSTEM) {
+                        priv->CurrentAuthentTransactionSeqNum = 0x001;
+                        send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0);
+                } else if (priv->connect_to_any_BSS) {
+                        int bss_index;
+                        
+                        priv->BSSinfo[(int)(priv->current_BSS)].channel |= 0x80;
+                        
+                        if ((bss_index  = retrieve_bss(priv)) != -1) {
+                                atmel_join_bss(priv, bss_index);
+                                return;
+                        }
                 }
         }
         
@@ -3205,7 +3208,7 @@ static void atmel_management_timer(u_long a)
                   priv->AuthenticationRequestRetryCnt++;
                   priv->CurrentAuthentTransactionSeqNum = 0x0001;
                   mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
-                  send_authentication_request(priv, NULL, 0);
+                  send_authentication_request(priv, C80211_MGMT_AAN_OPENSYSTEM, NULL, 0);
           }
           
           break;
@@ -3312,7 +3315,7 @@ static void atmel_command_irq(struct atmel_private *priv)
                                 
                                 mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
                                 priv->CurrentAuthentTransactionSeqNum = 0x0001;
-                                send_authentication_request(priv, NULL, 0);
+                                send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0);
                         }
                         return;
                 }
@@ -3482,11 +3485,6 @@ static int probe_atmel_card(struct net_device *dev)
                         printk(KERN_ALERT "%s: *** Invalid MAC address. UPGRADE Firmware ****\n", dev->name);
                         memcpy(dev->dev_addr, default_mac, 6);
                 }
-                printk(KERN_INFO "%s: MAC address %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
-                       dev->name,
-                       dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                       dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
-                
         }
         
         return rc;
diff --git a/drivers/net/wireless/atmel.h b/drivers/net/wireless/atmel.h
index 825000edfc2c..b9b3e5b76544 100644
--- a/drivers/net/wireless/atmel.h
+++ b/drivers/net/wireless/atmel.h
@@ -35,9 +35,9 @@ typedef enum {
         ATMEL_FW_TYPE_506
 } AtmelFWType;
 
-struct net_device *init_atmel_card(unsigned short, int, const AtmelFWType, struct device *, 
+struct net_device *init_atmel_card(unsigned short, unsigned long, const AtmelFWType, struct device *, 
                                     int (*present_func)(void *), void * );
-void stop_atmel_card( struct net_device *, int );
+void stop_atmel_card( struct net_device *);
 int atmel_open( struct net_device * );
 
 #endif
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 1bd13146c644..17d1fd90f832 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -63,6 +63,7 @@
    be present but disabled -- but it can then be enabled for specific
    modules at load time with a 'pc_debug=#' option to insmod.
 */
+
 #ifdef PCMCIA_DEBUG
 static int pc_debug = PCMCIA_DEBUG;
 module_param(pc_debug, int, 0);
@@ -285,41 +286,6 @@ static int card_present(void *arg)
         return 0;
 }
 
-/* list of cards we know about and their firmware requirements.
-   Go either by Manfid or version strings.
-   Cards not in this list will need a firmware parameter to the module
-   in all probability. Note that the SMC 2632 V2 and V3 have the same
-   manfids, so we ignore those and use the version1 strings. */
-
-static struct { 
-        int manf, card;
-        char *ver1;
-        AtmelFWType firmware;
-        char *name;
-} card_table[] = {
-        { 0, 0, "WLAN/802.11b PC CARD", ATMEL_FW_TYPE_502D, "Actiontec 802CAT1" },  
-        { 0, 0, "ATMEL/AT76C502AR", ATMEL_FW_TYPE_502, "NoName-RFMD" }, 
-        { 0, 0, "ATMEL/AT76C502AR_D", ATMEL_FW_TYPE_502D, "NoName-revD" }, 
-        { 0, 0, "ATMEL/AT76C502AR_E", ATMEL_FW_TYPE_502E, "NoName-revE" },
-        { 0, 0, "ATMEL/AT76C504", ATMEL_FW_TYPE_504, "NoName-504" },
-        { 0, 0, "ATMEL/AT76C504A", ATMEL_FW_TYPE_504A_2958, "NoName-504a-2958" },
-        { 0, 0, "ATMEL/AT76C504_R", ATMEL_FW_TYPE_504_2958, "NoName-504-2958" },
-        { MANFID_3COM, 0x0620, NULL, ATMEL_FW_TYPE_502_3COM, "3com 3CRWE62092B" }, 
-        { MANFID_3COM, 0x0696, NULL, ATMEL_FW_TYPE_502_3COM, "3com 3CRSHPW196" }, 
-        { 0, 0, "SMC/2632W-V2", ATMEL_FW_TYPE_502, "SMC 2632W-V2" },
-        { 0, 0, "SMC/2632W", ATMEL_FW_TYPE_502D, "SMC 2632W-V3" },
-        { 0xd601, 0x0007, NULL, ATMEL_FW_TYPE_502, "Sitecom WLAN-011" }, 
-        { 0x01bf, 0x3302, NULL, ATMEL_FW_TYPE_502E, "Belkin F5D6020-V2" }, 
-        { 0, 0, "BT/Voyager 1020 Laptop Adapter", ATMEL_FW_TYPE_502, "BT Voyager 1020" },
-        { 0, 0, "IEEE 802.11b/Wireless LAN PC Card", ATMEL_FW_TYPE_502, "Siemens Gigaset PC Card II" },
-        { 0, 0, "IEEE 802.11b/Wireless LAN Card S", ATMEL_FW_TYPE_504_2958, "Siemens Gigaset PC Card II" },
-        { 0, 0, "CNet/CNWLC 11Mbps Wireless PC Card V-5", ATMEL_FW_TYPE_502E, "CNet CNWLC-811ARL" },
-        { 0, 0, "Wireless/PC_CARD", ATMEL_FW_TYPE_502D, "Planet WL-3552" },
-        { 0, 0, "OEM/11Mbps Wireless LAN PC Card V-3", ATMEL_FW_TYPE_502, "OEM 11Mbps WLAN PCMCIA Card" },
-        { 0, 0, "11WAVE/11WP611AL-E", ATMEL_FW_TYPE_502E, "11WAVE WaveBuddy" },
-        { 0, 0, "LG/LW2100N", ATMEL_FW_TYPE_502E, "LG LW2100N 11Mbps WLAN PCMCIA Card" },
-};
-
 static void atmel_config(dev_link_t *link)
 {
         client_handle_t handle;
@@ -328,10 +294,11 @@ static void atmel_config(dev_link_t *link)
         local_info_t *dev;
         int last_fn, last_ret;
         u_char buf[64];
-        int card_index = -1, done = 0;
-        
+        struct pcmcia_device_id *did;
+
         handle = link->handle;
         dev = link->priv;
+        did = handle_to_dev(handle).driver_data;
 
         DEBUG(0, "atmel_config(0x%p)\n", link);
         
@@ -340,59 +307,6 @@ static void atmel_config(dev_link_t *link)
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
         
-        tuple.DesiredTuple = CISTPL_MANFID;
-        if (pcmcia_get_first_tuple(handle, &tuple) == 0) {
-                int i;
-                cistpl_manfid_t *manfid;
-                CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-                CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
-                manfid = &(parse.manfid);
-                for (i = 0; i < sizeof(card_table)/sizeof(card_table[0]); i++) {
-                        if (!card_table[i].ver1 &&
-                            manfid->manf == card_table[i].manf &&
-                            manfid->card == card_table[i].card) {
-                                card_index = i;
-                                done = 1;
-                        }
-                }
-        }
-
-        tuple.DesiredTuple = CISTPL_VERS_1;
-        if (!done && (pcmcia_get_first_tuple(handle, &tuple) == 0)) {
-                int i, j, k;
-                cistpl_vers_1_t *ver1;
-                CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-                CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
-                ver1 = &(parse.version_1);
-                
-                for (i = 0; i < sizeof(card_table)/sizeof(card_table[0]); i++) {
-                        for (j = 0; j < ver1->ns; j++) {
-                                char *p = card_table[i].ver1;
-                                char *q = &ver1->str[ver1->ofs[j]];
-                                if (!p)
-                                        goto mismatch;
-                                for (k = 0; k < j; k++) {
-                                        while ((*p != '\0') && (*p != '/')) p++;
-                                        if (*p == '\0') {
-                                                if (*q != '\0')
-                                                        goto mismatch;
-                                        } else {
-                                                p++;
-                                        }
-                                }
-                                while((*q != '\0') && (*p != '\0') && 
-                                      (*p != '/') && (*p == *q)) p++, q++;
-                                if (((*p != '\0') && *p != '/') || *q != '\0')
-                                        goto mismatch;
-                        }
-                        card_index = i;
-                        break;  /* done */
-                        
-                mismatch:
-                        j = 0; /* dummy stmt to shut up compiler */
-                }
-        }               
-
         /*
           This reads the card's CONFIG tuple to find its configuration
           registers.
@@ -509,12 +423,13 @@ static void atmel_config(dev_link_t *link)
         ((local_info_t*)link->priv)->eth_dev = 
                 init_atmel_card(link->irq.AssignedIRQ,
                                 link->io.BasePort1,
-                                card_index == -1 ? ATMEL_FW_TYPE_NONE :  card_table[card_index].firmware,
+                                did ? did->driver_info : ATMEL_FW_TYPE_NONE,
                                 &handle_to_dev(handle),
                                 card_present, 
                                 link);
         if (!((local_info_t*)link->priv)->eth_dev) 
-                goto cs_failed;
+                        goto cs_failed;
+        
         
         /*
           At this point, the dev_node_t structure(s) need to be
@@ -523,26 +438,7 @@ static void atmel_config(dev_link_t *link)
         strcpy(dev->node.dev_name, ((local_info_t*)link->priv)->eth_dev->name );
         dev->node.major = dev->node.minor = 0;
         link->dev = &dev->node;
-        
-        /* Finally, report what we've done */
-        printk(KERN_INFO "%s: %s%sindex 0x%02x: Vcc %d.%d",
-               dev->node.dev_name,
-               card_index == -1 ? "" :  card_table[card_index].name,
-               card_index == -1 ? "" : " ",
-               link->conf.ConfigIndex,
-               link->conf.Vcc/10, link->conf.Vcc%10);
-        if (link->conf.Vpp1)
-                printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10);
-        if (link->conf.Attributes & CONF_ENABLE_IRQ)
-                printk(", irq %d", link->irq.AssignedIRQ);
-        if (link->io.NumPorts1)
-                printk(", io 0x%04x-0x%04x", link->io.BasePort1,
-                       link->io.BasePort1+link->io.NumPorts1-1);
-        if (link->io.NumPorts2)
-                printk(" & 0x%04x-0x%04x", link->io.BasePort2,
-                       link->io.BasePort2+link->io.NumPorts2-1);
-        printk("\n");
-        
+                        
         link->state &= ~DEV_CONFIG_PENDING;
         return;
         
@@ -569,7 +465,7 @@ static void atmel_release(dev_link_t *link)
         link->dev = NULL;
         
         if (dev) 
-                stop_atmel_card(dev, 0);
+                stop_atmel_card(dev);
         ((local_info_t*)link->priv)->eth_dev = NULL; 
         
         /* Don't bother checking to see if these succeed or not */
@@ -637,25 +533,47 @@ static int atmel_event(event_t event, int priority,
 } /* atmel_event */
 
 /*====================================================================*/
+/* We use the driver_info field to store the correct firmware type for a card. */
+
+#define PCMCIA_DEVICE_MANF_CARD_INFO(manf, card, info) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \
+                        PCMCIA_DEV_ID_MATCH_CARD_ID, \
+        .manf_id = (manf), \
+        .card_id = (card), \
+        .driver_info = (kernel_ulong_t)(info), }
+
+#define PCMCIA_DEVICE_PROD_ID12_INFO(v1, v2, vh1, vh2, info) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2, \
+        .prod_id = { (v1), (v2), NULL, NULL }, \
+        .prod_id_hash = { (vh1), (vh2), 0, 0 }, \
+        .driver_info = (kernel_ulong_t)(info), }
+
 static struct pcmcia_device_id atmel_ids[] = {
-        PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0620),
-        PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0696),
-        PCMCIA_DEVICE_MANF_CARD(0x01bf, 0x3302),
-        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0007),
-        PCMCIA_DEVICE_PROD_ID12("11WAVE", "11WP611AL-E", 0x9eb2da1f, 0xc9a0d3f9),
-        PCMCIA_DEVICE_PROD_ID12("ATMEL", "AT76C502AR", 0xabda4164, 0x41b37e1f),
-        PCMCIA_DEVICE_PROD_ID12("ATMEL", "AT76C504", 0xabda4164, 0x5040670a),
-        PCMCIA_DEVICE_PROD_ID12("ATMEL", "AT76C504A", 0xabda4164, 0xe15ed87f),
-        PCMCIA_DEVICE_PROD_ID12("BT", "Voyager 1020 Laptop Adapter", 0xae49b86a, 0x1e957cd5),
-        PCMCIA_DEVICE_PROD_ID12("CNet", "CNWLC 11Mbps Wireless PC Card V-5", 0xbc477dde, 0x502fae6b),
-        PCMCIA_DEVICE_PROD_ID12("IEEE 802.11b", "Wireless LAN PC Card", 0x5b878724, 0x122f1df6),
-        PCMCIA_DEVICE_PROD_ID12("OEM", "11Mbps Wireless LAN PC Card V-3", 0xfea54c90, 0x1c5b0f68),
-        PCMCIA_DEVICE_PROD_ID12("SMC", "2632W", 0xc4f8b18b, 0x30f38774),
-        PCMCIA_DEVICE_PROD_ID12("SMC", "2632W-V2", 0xc4f8b18b, 0x172d1377),
-        PCMCIA_DEVICE_PROD_ID12("Wireless", "PC", 0xa407ecdd, 0x556e4d7e),
-        PCMCIA_DEVICE_PROD_ID12("WLAN", "802.11b PC CARD", 0x575c516c, 0xb1f6dbc4),
+        PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0620, ATMEL_FW_TYPE_502_3COM),
+        PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0696, ATMEL_FW_TYPE_502_3COM),
+        PCMCIA_DEVICE_MANF_CARD_INFO(0x01bf, 0x3302, ATMEL_FW_TYPE_502E),
+        PCMCIA_DEVICE_MANF_CARD_INFO(0xd601, 0x0007, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("11WAVE", "11WP611AL-E", 0x9eb2da1f, 0xc9a0d3f9, ATMEL_FW_TYPE_502E),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C502AR", 0xabda4164, 0x41b37e1f, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C502AR_D", 0xabda4164, 0x3675d704, ATMEL_FW_TYPE_502D),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C502AR_E", 0xabda4164, 0x4172e792, ATMEL_FW_TYPE_502E),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C504_R", 0xabda4164, 0x917f3d72, ATMEL_FW_TYPE_504_2958),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C504", 0xabda4164, 0x5040670a, ATMEL_FW_TYPE_504),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C504A", 0xabda4164, 0xe15ed87f, ATMEL_FW_TYPE_504A_2958),
+        PCMCIA_DEVICE_PROD_ID12_INFO("BT", "Voyager 1020 Laptop Adapter", 0xae49b86a, 0x1e957cd5, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("CNet", "CNWLC 11Mbps Wireless PC Card V-5", 0xbc477dde, 0x502fae6b, ATMEL_FW_TYPE_502E),
+        PCMCIA_DEVICE_PROD_ID12_INFO("IEEE 802.11b", "Wireless LAN PC Card", 0x5b878724, 0x122f1df6, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("IEEE 802.11b", "Wireless LAN Card S", 0x5b878724, 0x5fba533a, ATMEL_FW_TYPE_504_2958),
+        PCMCIA_DEVICE_PROD_ID12_INFO("OEM", "11Mbps Wireless LAN PC Card V-3", 0xfea54c90, 0x1c5b0f68, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("SMC", "2632W", 0xc4f8b18b, 0x30f38774, ATMEL_FW_TYPE_502D),
+        PCMCIA_DEVICE_PROD_ID12_INFO("SMC", "2632W-V2", 0xc4f8b18b, 0x172d1377, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("Wireless", "PC_CARD", 0xa407ecdd, 0x119f6314, ATMEL_FW_TYPE_502D),
+        PCMCIA_DEVICE_PROD_ID12_INFO("WLAN", "802.11b PC CARD", 0x575c516c, 0xb1f6dbc4, ATMEL_FW_TYPE_502D),
+        PCMCIA_DEVICE_PROD_ID12_INFO("LG", "LW2100N", 0xb474d43a, 0x6b1fec94, ATMEL_FW_TYPE_502E),
         PCMCIA_DEVICE_NULL
 };
+
 MODULE_DEVICE_TABLE(pcmcia, atmel_ids);
 
 static struct pcmcia_driver atmel_driver = {
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c
index 2eb00a957bbe..a61b3bc6cccf 100644
--- a/drivers/net/wireless/atmel_pci.c
+++ b/drivers/net/wireless/atmel_pci.c
@@ -72,7 +72,7 @@ static int __devinit atmel_pci_probe(struct pci_dev *pdev,
 
 static void __devexit atmel_pci_remove(struct pci_dev *pdev)
 {
-        stop_atmel_card(pci_get_drvdata(pdev), 1);
+        stop_atmel_card(pci_get_drvdata(pdev));
 }
 
 static int __init atmel_init_module(void)
diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 2a42add7f563..ea16805a153c 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -2,6 +2,8 @@
 #include <linux/module.h>
 #include <linux/ioport.h>
 
+#include "pci.h"
+
 /*
  * This interrupt-safe spinlock protects all accesses to PCI
  * configuration space.
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 061ead21ef14..c42b68d3aa24 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -32,8 +32,6 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
-#include <asm/semaphore.h>
-#include <asm/io.h>             
 #include <linux/pcieport_if.h>
 #include "pci_hotplug.h"
 
@@ -42,6 +40,7 @@
 extern int pciehp_poll_mode;
 extern int pciehp_poll_time;
 extern int pciehp_debug;
+extern int pciehp_force;
 
 /*#define dbg(format, arg...) do { if (pciehp_debug) printk(KERN_DEBUG "%s: " format, MY_NAME , ## arg); } while (0)*/
 #define dbg(format, arg...) do { if (pciehp_debug) printk("%s: " format, MY_NAME , ## arg); } while (0)
@@ -49,39 +48,20 @@ extern int pciehp_debug;
 #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg)
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
 
-struct pci_func {
-        struct pci_func *next;
-        u8 bus;
-        u8 device;
-        u8 function;
-        u8 is_a_board;
-        u16 status;
-        u8 configured;
-        u8 switch_save;
-        u8 presence_save;
-        u32 base_length[0x06];
-        u8 base_type[0x06];
-        u16 reserved2;
-        u32 config_space[0x20];
-        struct pci_resource *mem_head;
-        struct pci_resource *p_mem_head;
-        struct pci_resource *io_head;
-        struct pci_resource *bus_head;
-        struct pci_dev* pci_dev;
+struct hotplug_params {
+        u8 cache_line_size;
+        u8 latency_timer;
+        u8 enable_serr;
+        u8 enable_perr;
 };
 
 struct slot {
         struct slot *next;
         u8 bus;
         u8 device;
+        u16 status;
         u32 number;
-        u8 is_a_board;
-        u8 configured;
         u8 state;
-        u8 switch_save;
-        u8 presence_save;
-        u32 capabilities;
-        u16 reserved2;
         struct timer_list task_event;
         u8 hp_slot;
         struct controller *ctrl;
@@ -90,42 +70,47 @@ struct slot {
         struct list_head        slot_list;
 };
 
-struct pci_resource {
-        struct pci_resource * next;
-        u32 base;
-        u32 length;
-};
-
 struct event_info {
         u32 event_type;
         u8 hp_slot;
 };
 
+typedef u8(*php_intr_callback_t) (u8 hp_slot, void *instance_id);
+
+struct php_ctlr_state_s {
+        struct php_ctlr_state_s *pnext;
+        struct pci_dev *pci_dev;
+        unsigned int irq;
+        unsigned long flags;                            /* spinlock's */
+        u32 slot_device_offset;
+        u32 num_slots;
+        struct timer_list       int_poll_timer;         /* Added for poll event */
+        php_intr_callback_t     attention_button_callback;
+        php_intr_callback_t     switch_change_callback;
+        php_intr_callback_t     presence_change_callback;
+        php_intr_callback_t     power_fault_callback;
+        void                    *callback_instance_id;
+        struct ctrl_reg         *creg;                          /* Ptr to controller register space */
+};
+
+#define MAX_EVENTS              10
 struct controller {
         struct controller *next;
         struct semaphore crit_sect;     /* critical section semaphore */
-        void *hpc_ctlr_handle;          /* HPC controller handle */
+        struct php_ctlr_state_s *hpc_ctlr_handle; /* HPC controller handle */
         int num_slots;                  /* Number of slots on ctlr */
         int slot_num_inc;               /* 1 or -1 */
-        struct pci_resource *mem_head;
-        struct pci_resource *p_mem_head;
-        struct pci_resource *io_head;
-        struct pci_resource *bus_head;
         struct pci_dev *pci_dev;
         struct pci_bus *pci_bus;
-        struct event_info event_queue[10];
+        struct event_info event_queue[MAX_EVENTS];
         struct slot *slot;
         struct hpc_ops *hpc_ops;
         wait_queue_head_t queue;        /* sleep & wake process */
         u8 next_event;
-        u8 seg;
         u8 bus;
         u8 device;
         u8 function;
-        u8 rev;
         u8 slot_device_offset;
-        u8 add_support;
-        enum pci_bus_speed speed;
         u32 first_slot;         /* First physical slot number */  /* PCIE only has 1 slot */
         u8 slot_bus;            /* Bus where the slots handled by this controller sit */
         u8 ctrlcap;
@@ -133,20 +118,6 @@ struct controller {
         u8 cap_base;
 };
 
-struct irq_mapping {
-        u8 barber_pole;
-        u8 valid_INT;
-        u8 interrupt[4];
-};
-
-struct resource_lists {
-        struct pci_resource *mem_head;
-        struct pci_resource *p_mem_head;
-        struct pci_resource *io_head;
-        struct pci_resource *bus_head;
-        struct irq_mapping *irqs;
-};
-
 #define INT_BUTTON_IGNORE               0
 #define INT_PRESENCE_ON                 1
 #define INT_PRESENCE_OFF                2
@@ -200,21 +171,14 @@ struct resource_lists {
  * error Messages
  */
 #define msg_initialization_err  "Initialization failure, error=%d\n"
-#define msg_HPC_rev_error       "Unsupported revision of the PCI hot plug controller found.\n"
-#define msg_HPC_non_pcie        "The PCI hot plug controller is not supported by this driver.\n"
-#define msg_HPC_not_supported   "This system is not supported by this version of pciephd module. Upgrade to a newer version of pciehpd\n"
-#define msg_unable_to_save      "Unable to store PCI hot plug add resource information. This system must be rebooted before adding any PCI devices.\n"
 #define msg_button_on           "PCI slot #%d - powering on due to button press.\n"
 #define msg_button_off          "PCI slot #%d - powering off due to button press.\n"
 #define msg_button_cancel       "PCI slot #%d - action canceled due to button press.\n"
 #define msg_button_ignore       "PCI slot #%d - button press ignored.  (action in progress...)\n"
 
 /* controller functions */
-extern int      pciehprm_find_available_resources       (struct controller *ctrl);
 extern int      pciehp_event_start_thread       (void);
 extern void     pciehp_event_stop_thread        (void);
-extern struct   pci_func *pciehp_slot_create    (unsigned char busnumber);
-extern struct   pci_func *pciehp_slot_find      (unsigned char bus, unsigned char device, unsigned char index);
 extern int      pciehp_enable_slot              (struct slot *slot);
 extern int      pciehp_disable_slot             (struct slot *slot);
 
@@ -224,25 +188,17 @@ extern u8	pciehp_handle_presence_change	(u8 hp_slot, void *inst_id);
 extern u8       pciehp_handle_power_fault       (u8 hp_slot, void *inst_id);
 /* extern void  long_delay (int delay); */
 
-/* resource functions */
-extern int      pciehp_resource_sort_and_combine        (struct pci_resource **head);
-
 /* pci functions */
-extern int      pciehp_set_irq                  (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num);
-/*extern int    pciehp_get_bus_dev              (struct controller *ctrl, u8 *bus_num, u8 *dev_num, struct slot *slot);*/
-extern int      pciehp_save_config              (struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num);
-extern int      pciehp_save_used_resources      (struct controller *ctrl, struct pci_func * func, int flag);
-extern int      pciehp_save_slot_config         (struct controller *ctrl, struct pci_func * new_slot);
-extern void     pciehp_destroy_board_resources  (struct pci_func * func);
-extern int      pciehp_return_board_resources   (struct pci_func * func, struct resource_lists * resources);
-extern void     pciehp_destroy_resource_list    (struct resource_lists * resources);
-extern int      pciehp_configure_device         (struct controller* ctrl, struct pci_func* func);
-extern int      pciehp_unconfigure_device       (struct pci_func* func);
+extern int      pciehp_configure_device         (struct slot *p_slot);
+extern int      pciehp_unconfigure_device       (struct slot *p_slot);
+extern int      pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev);
+extern void     pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
+                struct hotplug_params *hpp);
+
 
 
 /* Global variables */
 extern struct controller *pciehp_ctrl_list;
-extern struct pci_func *pciehp_slot_list[256];
 
 /* Inline functions */
 
@@ -252,12 +208,9 @@ static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
 
         p_slot = ctrl->slot;
 
-        dbg("p_slot = %p\n", p_slot);
-
         while (p_slot && (p_slot->device != device)) {
                 tmp_slot = p_slot;
                 p_slot = p_slot->next;
-                dbg("In while loop, p_slot = %p\n", p_slot);
         }
         if (p_slot == NULL) {
                 err("ERROR: pciehp_find_slot device=0x%x\n", device);
@@ -273,7 +226,6 @@ static inline int wait_for_ctrl_irq(struct controller *ctrl)
 
         DECLARE_WAITQUEUE(wait, current);
 
-        dbg("%s : start\n", __FUNCTION__);
         add_wait_queue(&ctrl->queue, &wait);
         if (!pciehp_poll_mode)
                 /* Sleep for up to 1 second */
@@ -285,19 +237,9 @@ static inline int wait_for_ctrl_irq(struct controller *ctrl)
         if (signal_pending(current))
                 retval =  -EINTR;
 
-        dbg("%s : end\n", __FUNCTION__);
         return retval;
 }
 
-/* Puts node back in the resource list pointed to by head */
-static inline void return_resource(struct pci_resource **head, struct pci_resource *node)
-{
-        if (!node || !head)
-                return;
-        node->next = *head;
-        *head = node;
-}
-
 #define SLOT_NAME_SIZE 10
 
 static inline void make_slot_name(char *buffer, int buffer_size, struct slot *slot)
@@ -311,14 +253,7 @@ enum php_ctlr_type {
         ACPI
 };
 
-typedef u8(*php_intr_callback_t) (unsigned int change_id, void *instance_id);
-
-int pcie_init(struct controller *ctrl, struct pcie_device *dev,
-                php_intr_callback_t attention_button_callback,
-                php_intr_callback_t switch_change_callback,
-                php_intr_callback_t presence_change_callback,
-                php_intr_callback_t power_fault_callback);
-
+int pcie_init(struct controller *ctrl, struct pcie_device *dev);
 
 /* This has no meaning for PCI Express, as there is only 1 slot per port */
 int pcie_get_ctlr_slot_config(struct controller *ctrl,
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index cafc7eadcf80..8df704860348 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -27,27 +27,20 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <linux/proc_fs.h>
-#include <linux/slab.h>
-#include <linux/workqueue.h>
 #include <linux/pci.h>
-#include <linux/init.h>
-#include <asm/uaccess.h>
 #include "pciehp.h"
-#include "pciehprm.h"
 #include <linux/interrupt.h>
 
 /* Global variables */
 int pciehp_debug;
 int pciehp_poll_mode;
 int pciehp_poll_time;
+int pciehp_force;
 struct controller *pciehp_ctrl_list;
-struct pci_func *pciehp_slot_list[256];
 
 #define DRIVER_VERSION  "0.4"
 #define DRIVER_AUTHOR   "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
@@ -60,9 +53,11 @@ MODULE_LICENSE("GPL");
 module_param(pciehp_debug, bool, 0644);
 module_param(pciehp_poll_mode, bool, 0644);
 module_param(pciehp_poll_time, int, 0644);
+module_param(pciehp_force, bool, 0644);
 MODULE_PARM_DESC(pciehp_debug, "Debugging mode enabled or not");
 MODULE_PARM_DESC(pciehp_poll_mode, "Using polling mechanism for hot-plug events or not");
 MODULE_PARM_DESC(pciehp_poll_time, "Polling mechanism frequency, in seconds");
+MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if _OSC and OSHP are missing");
 
 #define PCIE_MODULE_NAME "pciehp"
 
@@ -114,8 +109,6 @@ static int init_slots(struct controller *ctrl)
         u32 slot_number;
         int result = -ENOMEM;
 
-        dbg("%s\n",__FUNCTION__);
-
         number_of_slots = ctrl->num_slots;
         slot_device = ctrl->slot_device_offset;
         slot_number = ctrl->first_slot;
@@ -370,7 +363,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         u8 value;
         struct pci_dev *pdev;
         
-        dbg("%s: Called by hp_drv\n", __FUNCTION__);
         ctrl = kmalloc(sizeof(*ctrl), GFP_KERNEL);
         if (!ctrl) {
                 err("%s : out of memory\n", __FUNCTION__);
@@ -378,22 +370,15 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         }
         memset(ctrl, 0, sizeof(struct controller));
 
-        dbg("%s: DRV_thread pid = %d\n", __FUNCTION__, current->pid);
-        
         pdev = dev->port;
+        ctrl->pci_dev = pdev;
 
-        rc = pcie_init(ctrl, dev,
-                (php_intr_callback_t) pciehp_handle_attention_button,
-                (php_intr_callback_t) pciehp_handle_switch_change,
-                (php_intr_callback_t) pciehp_handle_presence_change,
-                (php_intr_callback_t) pciehp_handle_power_fault);
+        rc = pcie_init(ctrl, dev);
         if (rc) {
                 dbg("%s: controller initialization failed\n", PCIE_MODULE_NAME);
                 goto err_out_free_ctrl;
         }
 
-        ctrl->pci_dev = pdev;
-
         pci_set_drvdata(pdev, ctrl);
 
         ctrl->pci_bus = kmalloc(sizeof(*ctrl->pci_bus), GFP_KERNEL);
@@ -402,7 +387,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
                 rc = -ENOMEM;
                 goto err_out_unmap_mmio_region;
         }
-        dbg("%s: ctrl->pci_bus %p\n", __FUNCTION__, ctrl->pci_bus);
         memcpy (ctrl->pci_bus, pdev->bus, sizeof (*ctrl->pci_bus));
         ctrl->bus = pdev->bus->number;  /* ctrl bus */
         ctrl->slot_bus = pdev->subordinate->number;  /* bus controlled by this HPC */
@@ -424,25 +408,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         first_device_num = ctrl->slot_device_offset;
         num_ctlr_slots = ctrl->num_slots; 
 
-        /* Store PCI Config Space for all devices on this bus */
-        dbg("%s: Before calling pciehp_save_config, ctrl->bus %x,ctrl->slot_bus %x\n", 
-                __FUNCTION__,ctrl->bus, ctrl->slot_bus);
-        rc = pciehp_save_config(ctrl, ctrl->slot_bus, num_ctlr_slots, first_device_num);
-        if (rc) {
-                err("%s: unable to save PCI configuration data, error %d\n", __FUNCTION__, rc);
-                goto err_out_free_ctrl_bus;
-        }
-
-        /* Get IO, memory, and IRQ resources for new devices */
-        rc = pciehprm_find_available_resources(ctrl);
-        ctrl->add_support = !rc;
-        
-        if (rc) {
-                dbg("pciehprm_find_available_resources = %#x\n", rc);
-                err("unable to locate PCI configuration resources for hot plug add.\n");
-                goto err_out_free_ctrl_bus;
-        }
-
         /* Setup the slot information structures */
         rc = init_slots(ctrl);
         if (rc) {
@@ -451,7 +416,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         }
 
         t_slot = pciehp_find_slot(ctrl, first_device_num);
-        dbg("%s: t_slot %p\n", __FUNCTION__, t_slot);
 
         /*      Finish setting up the hot plug ctrl device */
         ctrl->next_event = 0;
@@ -468,7 +432,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         down(&ctrl->crit_sect);
 
         t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
-        dbg("%s: adpater value %x\n", __FUNCTION__, value);
         
         if ((POWER_CTRL(ctrl->ctrlcap)) && !value) {
                 rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
@@ -501,7 +464,6 @@ err_out_none:
 
 static int pcie_start_thread(void)
 {
-        int loop;
         int retval = 0;
         
         dbg("Initialize + Start the notification/polling mechanism \n");
@@ -512,32 +474,11 @@ static int pcie_start_thread(void)
                 return retval;
         }
 
-        dbg("Initialize slot lists\n");
-        /* One slot list for each bus in the system */
-        for (loop = 0; loop < 256; loop++) {
-                pciehp_slot_list[loop] = NULL;
-        }
-
         return retval;
 }
 
-static inline void __exit
-free_pciehp_res(struct pci_resource *res)
-{
-        struct pci_resource *tres;
-
-        while (res) {
-                tres = res;
-                res = res->next;
-                kfree(tres);
-        }
-}
-
 static void __exit unload_pciehpd(void)
 {
-        struct pci_func *next;
-        struct pci_func *TempSlot;
-        int loop;
         struct controller *ctrl;
         struct controller *tctrl;
 
@@ -546,11 +487,6 @@ static void __exit unload_pciehpd(void)
         while (ctrl) {
                 cleanup_slots(ctrl);
 
-                free_pciehp_res(ctrl->io_head);
-                free_pciehp_res(ctrl->mem_head);
-                free_pciehp_res(ctrl->p_mem_head);
-                free_pciehp_res(ctrl->bus_head);
-
                 kfree (ctrl->pci_bus);
 
                 ctrl->hpc_ops->release_ctlr(ctrl);
@@ -561,20 +497,6 @@ static void __exit unload_pciehpd(void)
                 kfree(tctrl);
         }
 
-        for (loop = 0; loop < 256; loop++) {
-                next = pciehp_slot_list[loop];
-                while (next != NULL) {
-                        free_pciehp_res(next->io_head);
-                        free_pciehp_res(next->mem_head);
-                        free_pciehp_res(next->p_mem_head);
-                        free_pciehp_res(next->bus_head);
-
-                        TempSlot = next;
-                        next = next->next;
-                        kfree(TempSlot);
-                }
-        }
-
         /* Stop the notification mechanism */
         pciehp_event_stop_thread();
 
@@ -639,21 +561,16 @@ static int __init pcied_init(void)
         if (retval)
                 goto error_hpc_init;
 
-        retval = pciehprm_init(PCI);
-        if (!retval) {
-                retval = pcie_port_service_register(&hpdriver_portdrv);
-                dbg("pcie_port_service_register = %d\n", retval);
-                info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
-                if (retval)
-                   dbg("%s: Failure to register service\n", __FUNCTION__);
-        }
+        retval = pcie_port_service_register(&hpdriver_portdrv);
+        dbg("pcie_port_service_register = %d\n", retval);
+        info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
+        if (retval)
+                dbg("%s: Failure to register service\n", __FUNCTION__);
 
 error_hpc_init:
         if (retval) {
-                pciehprm_cleanup();
                 pciehp_event_stop_thread();
-        } else
-                pciehprm_print_pirt();
+        };
 
         return retval;
 }
@@ -663,9 +580,6 @@ static void __exit pcied_cleanup(void)
         dbg("unload_pciehpd()\n");
         unload_pciehpd();
 
-        pciehprm_cleanup();
-
-        dbg("pcie_port_service_unregister\n");
         pcie_port_service_unregister(&hpdriver_portdrv);
 
         info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 898f6da6f0de..5e582eca21d8 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -27,25 +27,14 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/workqueue.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/wait.h>
 #include <linux/smp_lock.h>
 #include <linux/pci.h>
 #include "../pci.h"
 #include "pciehp.h"
-#include "pciehprm.h"
 
-static u32 configure_new_device(struct controller *ctrl, struct pci_func *func,
-        u8 behind_bridge, struct resource_lists *resources, u8 bridge_bus, u8 bridge_dev);
-static int configure_new_function( struct controller *ctrl, struct pci_func *func,
-        u8 behind_bridge, struct resource_lists *resources, u8 bridge_bus, u8 bridge_dev);
 static void interrupt_event_handler(struct controller *ctrl);
 
 static struct semaphore event_semaphore;        /* mutex for process loop (up if something to process) */
@@ -60,22 +49,18 @@ u8 pciehp_handle_attention_button(u8 hp_slot, void *inst_id)
         struct slot *p_slot;
         u8 rc = 0;
         u8 getstatus;
-        struct pci_func *func;
         struct event_info *taskInfo;
 
         /* Attention Button Change */
         dbg("pciehp:  Attention button interrupt received.\n");
         
-        func = pciehp_slot_find(ctrl->slot_bus, (hp_slot + ctrl->slot_device_offset), 0);
-
         /* This is the structure that tells the worker thread what to do */
         taskInfo = &(ctrl->event_queue[ctrl->next_event]);
         p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
-        p_slot->hpc_ops->get_adapter_status(p_slot, &(func->presence_save));
         p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
         
-        ctrl->next_event = (ctrl->next_event + 1) % 10;
+        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
         taskInfo->hp_slot = hp_slot;
 
         rc++;
@@ -117,24 +102,20 @@ u8 pciehp_handle_switch_change(u8 hp_slot, void *inst_id)
         struct slot *p_slot;
         u8 rc = 0;
         u8 getstatus;
-        struct pci_func *func;
         struct event_info *taskInfo;
 
         /* Switch Change */
         dbg("pciehp:  Switch interrupt received.\n");
 
-        func = pciehp_slot_find(ctrl->slot_bus, (hp_slot + ctrl->slot_device_offset), 0);
-
         /* This is the structure that tells the worker thread
          * what to do
          */
         taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        ctrl->next_event = (ctrl->next_event + 1) % 10;
+        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
         taskInfo->hp_slot = hp_slot;
 
         rc++;
         p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
-        p_slot->hpc_ops->get_adapter_status(p_slot, &(func->presence_save));
         p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
 
         if (getstatus) {
@@ -142,14 +123,12 @@ u8 pciehp_handle_switch_change(u8 hp_slot, void *inst_id)
                  * Switch opened
                  */
                 info("Latch open on Slot(%d)\n", ctrl->first_slot + hp_slot);
-                func->switch_save = 0;
                 taskInfo->event_type = INT_SWITCH_OPEN;
         } else {
                 /*
                  *  Switch closed
                  */
                 info("Latch close on Slot(%d)\n", ctrl->first_slot + hp_slot);
-                func->switch_save = 0x10;
                 taskInfo->event_type = INT_SWITCH_CLOSE;
         }
 
@@ -163,20 +142,17 @@ u8 pciehp_handle_presence_change(u8 hp_slot, void *inst_id)
 {
         struct controller *ctrl = (struct controller *) inst_id;
         struct slot *p_slot;
-        u8 rc = 0;
-        struct pci_func *func;
+        u8 presence_save, rc = 0;
         struct event_info *taskInfo;
 
         /* Presence Change */
         dbg("pciehp:  Presence/Notify input change.\n");
 
-        func = pciehp_slot_find(ctrl->slot_bus, (hp_slot + ctrl->slot_device_offset), 0);
-
         /* This is the structure that tells the worker thread
          * what to do
          */
         taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        ctrl->next_event = (ctrl->next_event + 1) % 10;
+        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
         taskInfo->hp_slot = hp_slot;
 
         rc++;
@@ -185,8 +161,8 @@ u8 pciehp_handle_presence_change(u8 hp_slot, void *inst_id)
         /* Switch is open, assume a presence change
          * Save the presence state
          */
-        p_slot->hpc_ops->get_adapter_status(p_slot, &(func->presence_save));
-        if (func->presence_save) {
+        p_slot->hpc_ops->get_adapter_status(p_slot, &presence_save);
+        if (presence_save) {
                 /*
                  * Card Present
                  */
@@ -211,19 +187,16 @@ u8 pciehp_handle_power_fault(u8 hp_slot, void *inst_id)
         struct controller *ctrl = (struct controller *) inst_id;
         struct slot *p_slot;
         u8 rc = 0;
-        struct pci_func *func;
         struct event_info *taskInfo;
 
         /* power fault */
         dbg("pciehp:  Power fault interrupt received.\n");
 
-        func = pciehp_slot_find(ctrl->slot_bus, (hp_slot + ctrl->slot_device_offset), 0);
-
         /* this is the structure that tells the worker thread
          * what to do
          */
         taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        ctrl->next_event = (ctrl->next_event + 1) % 10;
+        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
         taskInfo->hp_slot = hp_slot;
 
         rc++;
@@ -234,7 +207,7 @@ u8 pciehp_handle_power_fault(u8 hp_slot, void *inst_id)
                  * power fault Cleared
                  */
                 info("Power fault cleared on Slot(%d)\n", ctrl->first_slot + hp_slot);
-                func->status = 0x00;
+                p_slot->status = 0x00;
                 taskInfo->event_type = INT_POWER_FAULT_CLEAR;
         } else {
                 /*
@@ -243,7 +216,7 @@ u8 pciehp_handle_power_fault(u8 hp_slot, void *inst_id)
                 info("Power fault on Slot(%d)\n", ctrl->first_slot + hp_slot);
                 taskInfo->event_type = INT_POWER_FAULT;
                 /* set power fault status for this board */
-                func->status = 0xFF;
+                p_slot->status = 0xFF;
                 info("power fault bit %x set\n", hp_slot);
         }
         if (rc)
@@ -252,810 +225,6 @@ u8 pciehp_handle_power_fault(u8 hp_slot, void *inst_id)
         return rc;
 }
 
-
-/**
- * sort_by_size: sort nodes by their length, smallest first.
- *
- * @head: list to sort
- */
-static int sort_by_size(struct pci_resource **head)
-{
-        struct pci_resource *current_res;
-        struct pci_resource *next_res;
-        int out_of_order = 1;
-
-        if (!(*head))
-                return 1;
-
-        if (!((*head)->next))
-                return 0;
-
-        while (out_of_order) {
-                out_of_order = 0;
-
-                /* Special case for swapping list head */
-                if (((*head)->next) &&
-                    ((*head)->length > (*head)->next->length)) {
-                        out_of_order++;
-                        current_res = *head;
-                        *head = (*head)->next;
-                        current_res->next = (*head)->next;
-                        (*head)->next = current_res;
-                }
-
-                current_res = *head;
-
-                while (current_res->next && current_res->next->next) {
-                        if (current_res->next->length > current_res->next->next->length) {
-                                out_of_order++;
-                                next_res = current_res->next;
-                                current_res->next = current_res->next->next;
-                                current_res = current_res->next;
-                                next_res->next = current_res->next;
-                                current_res->next = next_res;
-                        } else
-                                current_res = current_res->next;
-                }
-        }  /* End of out_of_order loop */
-
-        return 0;
-}
-
-
-/*
- * sort_by_max_size
- *
- * Sorts nodes on the list by their length.
- * Largest first.
- *
- */
-static int sort_by_max_size(struct pci_resource **head)
-{
-        struct pci_resource *current_res;
-        struct pci_resource *next_res;
-        int out_of_order = 1;
-
-        if (!(*head))
-                return 1;
-
-        if (!((*head)->next))
-                return 0;
-
-        while (out_of_order) {
-                out_of_order = 0;
-
-                /* Special case for swapping list head */
-                if (((*head)->next) &&
-                    ((*head)->length < (*head)->next->length)) {
-                        out_of_order++;
-                        current_res = *head;
-                        *head = (*head)->next;
-                        current_res->next = (*head)->next;
-                        (*head)->next = current_res;
-                }
-
-                current_res = *head;
-
-                while (current_res->next && current_res->next->next) {
-                        if (current_res->next->length < current_res->next->next->length) {
-                                out_of_order++;
-                                next_res = current_res->next;
-                                current_res->next = current_res->next->next;
-                                current_res = current_res->next;
-                                next_res->next = current_res->next;
-                                current_res->next = next_res;
-                        } else
-                                current_res = current_res->next;
-                }
-        }  /* End of out_of_order loop */
-
-        return 0;
-}
-
-
-/**
- * do_pre_bridge_resource_split: return one unused resource node
- * @head: list to scan
- *
- */
-static struct pci_resource *
-do_pre_bridge_resource_split(struct pci_resource **head,
-                                struct pci_resource **orig_head, u32 alignment)
-{
-        struct pci_resource *prevnode = NULL;
-        struct pci_resource *node;
-        struct pci_resource *split_node;
-        u32 rc;
-        u32 temp_dword;
-        dbg("do_pre_bridge_resource_split\n");
-
-        if (!(*head) || !(*orig_head))
-                return NULL;
-
-        rc = pciehp_resource_sort_and_combine(head);
-
-        if (rc)
-                return NULL;
-
-        if ((*head)->base != (*orig_head)->base)
-                return NULL;
-
-        if ((*head)->length == (*orig_head)->length)
-                return NULL;
-
-
-        /* If we got here, there the bridge requires some of the resource, but
-         *  we may be able to split some off of the front
-         */     
-        node = *head;
-
-        if (node->length & (alignment -1)) {
-                /* this one isn't an aligned length, so we'll make a new entry
-                 * and split it up.
-                 */
-                split_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-
-                if (!split_node)
-                        return NULL;
-
-                temp_dword = (node->length | (alignment-1)) + 1 - alignment;
-
-                split_node->base = node->base;
-                split_node->length = temp_dword;
-
-                node->length -= temp_dword;
-                node->base += split_node->length;
-
-                /* Put it in the list */
-                *head = split_node;
-                split_node->next = node;
-        }
-
-        if (node->length < alignment)
-                return NULL;
-
-        /* Now unlink it */
-        if (*head == node) {
-                *head = node->next;
-        } else {
-                prevnode = *head;
-                while (prevnode->next != node)
-                        prevnode = prevnode->next;
-
-                prevnode->next = node->next;
-        }
-        node->next = NULL;
-
-        return node;
-}
-
-
-/**
- * do_bridge_resource_split: return one unused resource node
- * @head: list to scan
- *
- */
-static struct pci_resource *
-do_bridge_resource_split(struct pci_resource **head, u32 alignment)
-{
-        struct pci_resource *prevnode = NULL;
-        struct pci_resource *node;
-        u32 rc;
-        u32 temp_dword;
-
-        if (!(*head))
-                return NULL;
-
-        rc = pciehp_resource_sort_and_combine(head);
-
-        if (rc)
-                return NULL;
-
-        node = *head;
-
-        while (node->next) {
-                prevnode = node;
-                node = node->next;
-                kfree(prevnode);
-        }
-
-        if (node->length < alignment) {
-                kfree(node);
-                return NULL;
-        }
-
-        if (node->base & (alignment - 1)) {
-                /* Short circuit if adjusted size is too small */
-                temp_dword = (node->base | (alignment-1)) + 1;
-                if ((node->length - (temp_dword - node->base)) < alignment) {
-                        kfree(node);
-                        return NULL;
-                }
-
-                node->length -= (temp_dword - node->base);
-                node->base = temp_dword;
-        }
-
-        if (node->length & (alignment - 1)) {
-                /* There's stuff in use after this node */
-                kfree(node);
-                return NULL;
-        }
-
-        return node;
-}
-
-
-/*
- * get_io_resource
- *
- * this function sorts the resource list by size and then
- * returns the first node of "size" length that is not in the
- * ISA aliasing window.  If it finds a node larger than "size"
- * it will split it up.
- *
- * size must be a power of two.
- */
-static struct pci_resource *get_io_resource(struct pci_resource **head, u32 size)
-{
-        struct pci_resource *prevnode;
-        struct pci_resource *node;
-        struct pci_resource *split_node = NULL;
-        u32 temp_dword;
-
-        if (!(*head))
-                return NULL;
-
-        if ( pciehp_resource_sort_and_combine(head) )
-                return NULL;
-
-        if ( sort_by_size(head) )
-                return NULL;
-
-        for (node = *head; node; node = node->next) {
-                if (node->length < size)
-                        continue;
-
-                if (node->base & (size - 1)) {
-                        /* this one isn't base aligned properly
-                           so we'll make a new entry and split it up */
-                        temp_dword = (node->base | (size-1)) + 1;
-
-                        /*/ Short circuit if adjusted size is too small */
-                        if ((node->length - (temp_dword - node->base)) < size)
-                                continue;
-
-                        split_node = kmalloc(sizeof(struct pci_resource),
-                                                GFP_KERNEL);
-
-                        if (!split_node)
-                                return NULL;
-
-                        split_node->base = node->base;
-                        split_node->length = temp_dword - node->base;
-                        node->base = temp_dword;
-                        node->length -= split_node->length;
-
-                        /* Put it in the list */
-                        split_node->next = node->next;
-                        node->next = split_node;
-                } /* End of non-aligned base */
-
-                /* Don't need to check if too small since we already did */
-                if (node->length > size) {
-                        /* this one is longer than we need
-                           so we'll make a new entry and split it up */
-                        split_node = kmalloc(sizeof(struct pci_resource),
-                                                GFP_KERNEL);
-
-                        if (!split_node)
-                                return NULL;
-
-                        split_node->base = node->base + size;
-                        split_node->length = node->length - size;
-                        node->length = size;
-
-                        /* Put it in the list */
-                        split_node->next = node->next;
-                        node->next = split_node;
-                }  /* End of too big on top end */
-
-                /* For IO make sure it's not in the ISA aliasing space */
-                if (node->base & 0x300L)
-                        continue;
-
-                /* If we got here, then it is the right size 
-                   Now take it out of the list */
-                if (*head == node) {
-                        *head = node->next;
-                } else {
-                        prevnode = *head;
-                        while (prevnode->next != node)
-                                prevnode = prevnode->next;
-
-                        prevnode->next = node->next;
-                }
-                node->next = NULL;
-                /* Stop looping */
-                break;
-        }
-
-        return node;
-}
-
-
-/*
- * get_max_resource
- *
- * Gets the largest node that is at least "size" big from the
- * list pointed to by head.  It aligns the node on top and bottom
- * to "size" alignment before returning it.
- * J.I. modified to put max size limits of; 64M->32M->16M->8M->4M->1M
- *  This is needed to avoid allocating entire ACPI _CRS res to one child bridge/slot.
- */
-static struct pci_resource *get_max_resource(struct pci_resource **head, u32 size)
-{
-        struct pci_resource *max;
-        struct pci_resource *temp;
-        struct pci_resource *split_node;
-        u32 temp_dword;
-        u32 max_size[] = { 0x4000000, 0x2000000, 0x1000000, 0x0800000, 0x0400000, 0x0200000, 0x0100000, 0x00 };
-        int i;
-
-        if (!(*head))
-                return NULL;
-
-        if (pciehp_resource_sort_and_combine(head))
-                return NULL;
-
-        if (sort_by_max_size(head))
-                return NULL;
-
-        for (max = *head;max; max = max->next) {
-
-                /* If not big enough we could probably just bail, 
-                   instead we'll continue to the next. */
-                if (max->length < size)
-                        continue;
-
-                if (max->base & (size - 1)) {
-                        /* this one isn't base aligned properly
-                           so we'll make a new entry and split it up */
-                        temp_dword = (max->base | (size-1)) + 1;
-
-                        /* Short circuit if adjusted size is too small */
-                        if ((max->length - (temp_dword - max->base)) < size)
-                                continue;
-
-                        split_node = kmalloc(sizeof(struct pci_resource),
-                                                GFP_KERNEL);
-
-                        if (!split_node)
-                                return NULL;
-
-                        split_node->base = max->base;
-                        split_node->length = temp_dword - max->base;
-                        max->base = temp_dword;
-                        max->length -= split_node->length;
-
-                        /* Put it next in the list */
-                        split_node->next = max->next;
-                        max->next = split_node;
-                }
-
-                if ((max->base + max->length) & (size - 1)) {
-                        /* this one isn't end aligned properly at the top
-                           so we'll make a new entry and split it up */
-                        split_node = kmalloc(sizeof(struct pci_resource),
-                                                GFP_KERNEL);
-
-                        if (!split_node)
-                                return NULL;
-                        temp_dword = ((max->base + max->length) & ~(size - 1));
-                        split_node->base = temp_dword;
-                        split_node->length = max->length + max->base
-                                             - split_node->base;
-                        max->length -= split_node->length;
-
-                        /* Put it in the list */
-                        split_node->next = max->next;
-                        max->next = split_node;
-                }
-
-                /* Make sure it didn't shrink too much when we aligned it */
-                if (max->length < size)
-                        continue;
-
-                for ( i = 0; max_size[i] > size; i++) {
-                        if (max->length > max_size[i]) {
-                                split_node = kmalloc(sizeof(struct pci_resource),
-                                                        GFP_KERNEL);
-                                if (!split_node)
-                                        break;  /* return NULL; */
-                                split_node->base = max->base + max_size[i];
-                                split_node->length = max->length - max_size[i];
-                                max->length = max_size[i];
-                                /* Put it next in the list */
-                                split_node->next = max->next;
-                                max->next = split_node;
-                                break;
-                        }
-                }
-
-                /* Now take it out of the list */
-                temp = (struct pci_resource*) *head;
-                if (temp == max) {
-                        *head = max->next;
-                } else {
-                        while (temp && temp->next != max) {
-                                temp = temp->next;
-                        }
-
-                        temp->next = max->next;
-                }
-
-                max->next = NULL;
-                return max;
-        }
-
-        /* If we get here, we couldn't find one */
-        return NULL;
-}
-
-
-/*
- * get_resource
- *
- * this function sorts the resource list by size and then
- * returns the first node of "size" length.  If it finds a node
- * larger than "size" it will split it up.
- *
- * size must be a power of two.
- */
-static struct pci_resource *get_resource(struct pci_resource **head, u32 size)
-{
-        struct pci_resource *prevnode;
-        struct pci_resource *node;
-        struct pci_resource *split_node;
-        u32 temp_dword;
-
-        if (!(*head))
-                return NULL;
-
-        if ( pciehp_resource_sort_and_combine(head) )
-                return NULL;
-
-        if ( sort_by_size(head) )
-                return NULL;
-
-        for (node = *head; node; node = node->next) {
-                dbg("%s: req_size =0x%x node=%p, base=0x%x, length=0x%x\n",
-                    __FUNCTION__, size, node, node->base, node->length);
-                if (node->length < size)
-                        continue;
-
-                if (node->base & (size - 1)) {
-                        dbg("%s: not aligned\n", __FUNCTION__);
-                        /* this one isn't base aligned properly
-                           so we'll make a new entry and split it up */
-                        temp_dword = (node->base | (size-1)) + 1;
-
-                        /* Short circuit if adjusted size is too small */
-                        if ((node->length - (temp_dword - node->base)) < size)
-                                continue;
-
-                        split_node = kmalloc(sizeof(struct pci_resource),
-                                                GFP_KERNEL);
-
-                        if (!split_node)
-                                return NULL;
-
-                        split_node->base = node->base;
-                        split_node->length = temp_dword - node->base;
-                        node->base = temp_dword;
-                        node->length -= split_node->length;
-
-                        /* Put it in the list */
-                        split_node->next = node->next;
-                        node->next = split_node;
-                } /* End of non-aligned base */
-
-                /* Don't need to check if too small since we already did */
-                if (node->length > size) {
-                        dbg("%s: too big\n", __FUNCTION__);
-                        /* this one is longer than we need
-                           so we'll make a new entry and split it up */
-                        split_node = kmalloc(sizeof(struct pci_resource),
-                                                GFP_KERNEL);
-
-                        if (!split_node)
-                                return NULL;
-
-                        split_node->base = node->base + size;
-                        split_node->length = node->length - size;
-                        node->length = size;
-
-                        /* Put it in the list */
-                        split_node->next = node->next;
-                        node->next = split_node;
-                }  /* End of too big on top end */
-
-                dbg("%s: got one!!!\n", __FUNCTION__);
-                /* If we got here, then it is the right size
-                   Now take it out of the list */
-                if (*head == node) {
-                        *head = node->next;
-                } else {
-                        prevnode = *head;
-                        while (prevnode->next != node)
-                                prevnode = prevnode->next;
-
-                        prevnode->next = node->next;
-                }
-                node->next = NULL;
-                /* Stop looping */
-                break;
-        }
-        return node;
-}
-
-
-/*
- * pciehp_resource_sort_and_combine
- *
- * Sorts all of the nodes in the list in ascending order by
- * their base addresses.  Also does garbage collection by
- * combining adjacent nodes.
- *
- * returns 0 if success
- */
-int pciehp_resource_sort_and_combine(struct pci_resource **head)
-{
-        struct pci_resource *node1;
-        struct pci_resource *node2;
-        int out_of_order = 1;
-
-        dbg("%s: head = %p, *head = %p\n", __FUNCTION__, head, *head);
-
-        if (!(*head))
-                return 1;
-
-        dbg("*head->next = %p\n",(*head)->next);
-
-        if (!(*head)->next)
-                return 0;       /* only one item on the list, already sorted! */
-
-        dbg("*head->base = 0x%x\n",(*head)->base);
-        dbg("*head->next->base = 0x%x\n",(*head)->next->base);
-        while (out_of_order) {
-                out_of_order = 0;
-
-                /* Special case for swapping list head */
-                if (((*head)->next) &&
-                    ((*head)->base > (*head)->next->base)) {
-                        node1 = *head;
-                        (*head) = (*head)->next;
-                        node1->next = (*head)->next;
-                        (*head)->next = node1;
-                        out_of_order++;
-                }
-
-                node1 = (*head);
-
-                while (node1->next && node1->next->next) {
-                        if (node1->next->base > node1->next->next->base) {
-                                out_of_order++;
-                                node2 = node1->next;
-                                node1->next = node1->next->next;
-                                node1 = node1->next;
-                                node2->next = node1->next;
-                                node1->next = node2;
-                        } else
-                                node1 = node1->next;
-                }
-        }  /* End of out_of_order loop */
-
-        node1 = *head;
-
-        while (node1 && node1->next) {
-                if ((node1->base + node1->length) == node1->next->base) {
-                        /* Combine */
-                        dbg("8..\n");
-                        node1->length += node1->next->length;
-                        node2 = node1->next;
-                        node1->next = node1->next->next;
-                        kfree(node2);
-                } else
-                        node1 = node1->next;
-        }
-
-        return 0;
-}
-
-
-/**
- * pciehp_slot_create - Creates a node and adds it to the proper bus.
- * @busnumber - bus where new node is to be located
- *
- * Returns pointer to the new node or NULL if unsuccessful
- */
-struct pci_func *pciehp_slot_create(u8 busnumber)
-{
-        struct pci_func *new_slot;
-        struct pci_func *next;
-        dbg("%s: busnumber %x\n", __FUNCTION__, busnumber);
-        new_slot = kmalloc(sizeof(struct pci_func), GFP_KERNEL);
-
-        if (new_slot == NULL)
-                return new_slot;
-
-        memset(new_slot, 0, sizeof(struct pci_func));
-
-        new_slot->next = NULL;
-        new_slot->configured = 1;
-
-        if (pciehp_slot_list[busnumber] == NULL) {
-                pciehp_slot_list[busnumber] = new_slot;
-        } else {
-                next = pciehp_slot_list[busnumber];
-                while (next->next != NULL)
-                        next = next->next;
-                next->next = new_slot;
-        }
-        return new_slot;
-}
-
-
-/**
- * slot_remove - Removes a node from the linked list of slots.
- * @old_slot: slot to remove
- *
- * Returns 0 if successful, !0 otherwise.
- */
-static int slot_remove(struct pci_func * old_slot)
-{
-        struct pci_func *next;
-
-        if (old_slot == NULL)
-                return 1;
-
-        next = pciehp_slot_list[old_slot->bus];
-
-        if (next == NULL)
-                return 1;
-
-        if (next == old_slot) {
-                pciehp_slot_list[old_slot->bus] = old_slot->next;
-                pciehp_destroy_board_resources(old_slot);
-                kfree(old_slot);
-                return 0;
-        }
-
-        while ((next->next != old_slot) && (next->next != NULL)) {
-                next = next->next;
-        }
-
-        if (next->next == old_slot) {
-                next->next = old_slot->next;
-                pciehp_destroy_board_resources(old_slot);
-                kfree(old_slot);
-                return 0;
-        } else
-                return 2;
-}
-
-
-/**
- * bridge_slot_remove - Removes a node from the linked list of slots.
- * @bridge: bridge to remove
- *
- * Returns 0 if successful, !0 otherwise.
- */
-static int bridge_slot_remove(struct pci_func *bridge)
-{
-        u8 subordinateBus, secondaryBus;
-        u8 tempBus;
-        struct pci_func *next;
-
-        if (bridge == NULL)
-                return 1;
-
-        secondaryBus = (bridge->config_space[0x06] >> 8) & 0xFF;
-        subordinateBus = (bridge->config_space[0x06] >> 16) & 0xFF;
-
-        for (tempBus = secondaryBus; tempBus <= subordinateBus; tempBus++) {
-                next = pciehp_slot_list[tempBus];
-
-                while (!slot_remove(next)) {
-                        next = pciehp_slot_list[tempBus];
-                }
-        }
-
-        next = pciehp_slot_list[bridge->bus];
-
-        if (next == NULL) {
-                return 1;
-        }
-
-        if (next == bridge) {
-                pciehp_slot_list[bridge->bus] = bridge->next;
-                kfree(bridge);
-                return 0;
-        }
-
-        while ((next->next != bridge) && (next->next != NULL)) {
-                next = next->next;
-        }
-
-        if (next->next == bridge) {
-                next->next = bridge->next;
-                kfree(bridge);
-                return 0;
-        } else
-                return 2;
-}
-
-
-/**
- * pciehp_slot_find - Looks for a node by bus, and device, multiple functions accessed
- * @bus: bus to find
- * @device: device to find
- * @index: is 0 for first function found, 1 for the second...
- *
- * Returns pointer to the node if successful, %NULL otherwise.
- */
-struct pci_func *pciehp_slot_find(u8 bus, u8 device, u8 index)
-{
-        int found = -1;
-        struct pci_func *func;
-
-        func = pciehp_slot_list[bus];
-        dbg("%s: bus %x device %x index %x\n",
-                __FUNCTION__, bus, device, index);
-        if (func != NULL) {
-                dbg("%s: func-> bus %x device %x function %x pci_dev %p\n",
-                        __FUNCTION__, func->bus, func->device, func->function,
-                        func->pci_dev);
-        } else
-                dbg("%s: func == NULL\n", __FUNCTION__);
-
-        if ((func == NULL) || ((func->device == device) && (index == 0)))
-                return func;
-
-        if (func->device == device)
-                found++;
-
-        while (func->next != NULL) {
-                func = func->next;
-
-                dbg("%s: In while loop, func-> bus %x device %x function %x pci_dev %p\n",
-                        __FUNCTION__, func->bus, func->device, func->function,
-                        func->pci_dev);
-                if (func->device == device)
-                        found++;
-                dbg("%s: while loop, found %d, index %d\n", __FUNCTION__,
-                        found, index);
-
-                if ((found == index) || (func->function == index)) {
-                        dbg("%s: Found bus %x dev %x func %x\n", __FUNCTION__,
-                                        func->bus, func->device, func->function);
-                        return func;
-                }
-        }
-
-        return NULL;
-}
-
-static int is_bridge(struct pci_func * func)
-{
-        /* Check the header type */
-        if (((func->config_space[0x03] >> 16) & 0xFF) == 0x01)
-                return 1;
-        else
-                return 0;
-}
-
-
 /* The following routines constitute the bulk of the 
    hotplug controller logic
  */
@@ -1100,20 +269,17 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
  * Configures board
  *
  */
-static u32 board_added(struct pci_func * func, struct controller * ctrl)
+static int board_added(struct slot *p_slot)
 {
         u8 hp_slot;
-        int index;
-        u32 temp_register = 0xFFFFFFFF;
-        u32 rc = 0;
-        struct pci_func *new_func = NULL;
-        struct slot *p_slot;
-        struct resource_lists res_lists;
+        int rc = 0;
+        struct controller *ctrl = p_slot->ctrl;
 
-        p_slot = pciehp_find_slot(ctrl, func->device);
-        hp_slot = func->device - ctrl->slot_device_offset;
+        hp_slot = p_slot->device - ctrl->slot_device_offset;
 
-        dbg("%s: func->device, slot_offset, hp_slot = %d, %d ,%d\n", __FUNCTION__, func->device, ctrl->slot_device_offset, hp_slot);
+        dbg("%s: slot device, slot offset, hp slot = %d, %d ,%d\n",
+                        __FUNCTION__, p_slot->device,
+                        ctrl->slot_device_offset, hp_slot);
 
         /* Wait for exclusive access to hardware */
         down(&ctrl->crit_sect);
@@ -1141,9 +307,7 @@ static u32 board_added(struct pci_func * func, struct controller * ctrl)
         up(&ctrl->crit_sect);
 
         /* Wait for ~1 second */
-        dbg("%s: before long_delay\n", __FUNCTION__);
         wait_for_ctrl_irq (ctrl);
-        dbg("%s: afterlong_delay\n", __FUNCTION__);
 
         /*  Check link training status */
         rc = p_slot->hpc_ops->check_lnk_status(ctrl);  
@@ -1153,98 +317,47 @@ static u32 board_added(struct pci_func * func, struct controller * ctrl)
                 return rc;
         }
 
-        dbg("%s: func status = %x\n", __FUNCTION__, func->status);
+        dbg("%s: slot status = %x\n", __FUNCTION__, p_slot->status);
 
         /* Check for a power fault */
-        if (func->status == 0xFF) {
+        if (p_slot->status == 0xFF) {
                 /* power fault occurred, but it was benign */
-                temp_register = 0xFFFFFFFF;
-                dbg("%s: temp register set to %x by power fault\n", __FUNCTION__, temp_register);
                 rc = POWER_FAILURE;
-                func->status = 0;
-        } else {
-                /* Get vendor/device ID u32 */
-                rc = pci_bus_read_config_dword (ctrl->pci_dev->subordinate, PCI_DEVFN(func->device, func->function), 
-                        PCI_VENDOR_ID, &temp_register);
-                dbg("%s: pci_bus_read_config_dword returns %d\n", __FUNCTION__, rc);
-                dbg("%s: temp_register is %x\n", __FUNCTION__, temp_register);
-
-                if (rc != 0) {
-                        /* Something's wrong here */
-                        temp_register = 0xFFFFFFFF;
-                        dbg("%s: temp register set to %x by error\n", __FUNCTION__, temp_register);
-                }
-                /* Preset return code.  It will be changed later if things go okay. */
-                rc = NO_ADAPTER_PRESENT;
+                p_slot->status = 0;
+                goto err_exit;
         }
 
-        /* All F's is an empty slot or an invalid board */
-        if (temp_register != 0xFFFFFFFF) {        /* Check for a board in the slot */
-                res_lists.io_head = ctrl->io_head;
-                res_lists.mem_head = ctrl->mem_head;
-                res_lists.p_mem_head = ctrl->p_mem_head;
-                res_lists.bus_head = ctrl->bus_head;
-                res_lists.irqs = NULL;
-
-                rc = configure_new_device(ctrl, func, 0, &res_lists, 0, 0);
-                dbg("%s: back from configure_new_device\n", __FUNCTION__);
-
-                ctrl->io_head = res_lists.io_head;
-                ctrl->mem_head = res_lists.mem_head;
-                ctrl->p_mem_head = res_lists.p_mem_head;
-                ctrl->bus_head = res_lists.bus_head;
+        rc = pciehp_configure_device(p_slot);
+        if (rc) {
+                err("Cannot add device 0x%x:%x\n", p_slot->bus,
+                                p_slot->device);
+                goto err_exit;
+        }
 
-                pciehp_resource_sort_and_combine(&(ctrl->mem_head));
-                pciehp_resource_sort_and_combine(&(ctrl->p_mem_head));
-                pciehp_resource_sort_and_combine(&(ctrl->io_head));
-                pciehp_resource_sort_and_combine(&(ctrl->bus_head));
+        p_slot->status = 0;
 
-                if (rc) {
-                        set_slot_off(ctrl, p_slot);
-                        return rc;
-                }
-                pciehp_save_slot_config(ctrl, func);
-
-                func->status = 0;
-                func->switch_save = 0x10;
-                func->is_a_board = 0x01;
+        /*
+         * Some PCI Express root ports require fixup after hot-plug operation.
+         */
+        if (pcie_mch_quirk)
+                pci_fixup_device(pci_fixup_final, ctrl->pci_dev);
+        if (PWR_LED(ctrl->ctrlcap)) {
+                /* Wait for exclusive access to hardware */
+                down(&ctrl->crit_sect);
 
-                /* next, we will instantiate the linux pci_dev structures 
-                 * (with appropriate driver notification, if already present) 
-                 */
-                index = 0;
-                do {
-                        new_func = pciehp_slot_find(ctrl->slot_bus, func->device, index++);
-                        if (new_func && !new_func->pci_dev) {
-                                dbg("%s:call pci_hp_configure_dev, func %x\n", 
-                                        __FUNCTION__, index);
-                                pciehp_configure_device(ctrl, new_func);
-                        }
-                } while (new_func);
-
-                /* 
-                 * Some PCI Express root ports require fixup after hot-plug operation.
-                 */
-                if (pcie_mch_quirk)
-                        pci_fixup_device(pci_fixup_final, ctrl->pci_dev);
- 
-                if (PWR_LED(ctrl->ctrlcap)) {
-                        /* Wait for exclusive access to hardware */
-                        down(&ctrl->crit_sect);
-   
-                        p_slot->hpc_ops->green_led_on(p_slot);
+                p_slot->hpc_ops->green_led_on(p_slot);
   
-                        /* Wait for the command to complete */
-                        wait_for_ctrl_irq (ctrl);
+                /* Wait for the command to complete */
+                wait_for_ctrl_irq (ctrl);
         
-                        /* Done with exclusive hardware access */
-                        up(&ctrl->crit_sect);
-                }
-        } else {
-                set_slot_off(ctrl, p_slot);
-                return -1;
-        }
+                /* Done with exclusive hardware access */
+                up(&ctrl->crit_sect);
+        }
         return 0;
+
+err_exit:
+        set_slot_off(ctrl, p_slot);
+        return -1;
 }
 
 
@@ -1252,55 +365,25 @@ static u32 board_added(struct pci_func * func, struct controller * ctrl)
  * remove_board - Turns off slot and LED's
  *
  */
-static u32 remove_board(struct pci_func *func, struct controller *ctrl)
+static int remove_board(struct slot *p_slot)
 {
-        int index;
-        u8 skip = 0;
         u8 device;
         u8 hp_slot;
-        u32 rc;
-        struct resource_lists res_lists;
-        struct pci_func *temp_func;
-        struct slot *p_slot;
-
-        if (func == NULL)
-                return 1;
+        int rc;
+        struct controller *ctrl = p_slot->ctrl;
 
-        if (pciehp_unconfigure_device(func))
+        if (pciehp_unconfigure_device(p_slot))
                 return 1;
 
-        device = func->device;
+        device = p_slot->device;
 
-        hp_slot = func->device - ctrl->slot_device_offset;
+        hp_slot = p_slot->device - ctrl->slot_device_offset;
         p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
         dbg("In %s, hp_slot = %d\n", __FUNCTION__, hp_slot);
 
-        if ((ctrl->add_support) &&
-                !(func->bus_head || func->mem_head || func->p_mem_head || func->io_head)) {
-                /* Here we check to see if we've saved any of the board's
-                 * resources already.  If so, we'll skip the attempt to
-                 * determine what's being used.
-                 */
-                index = 0;
-
-                temp_func = func;
-
-                while ((temp_func = pciehp_slot_find(temp_func->bus, temp_func->device, index++))) {
-                        if (temp_func->bus_head || temp_func->mem_head
-                            || temp_func->p_mem_head || temp_func->io_head) {
-                                skip = 1;
-                                break;
-                        }
-                }
-
-                if (!skip)
-                        rc = pciehp_save_used_resources(ctrl, func, DISABLE_CARD);
-        }
         /* Change status to shutdown */
-        if (func->is_a_board)
-                func->status = 0x01;
-        func->configured = 0;
+        p_slot->status = 0x01;
 
         /* Wait for exclusive access to hardware */
         down(&ctrl->crit_sect);
@@ -1328,56 +411,6 @@ static u32 remove_board(struct pci_func *func, struct controller *ctrl)
         /* Done with exclusive hardware access */
         up(&ctrl->crit_sect);
 
-        if (ctrl->add_support) {
-                while (func) {
-                        res_lists.io_head = ctrl->io_head;
-                        res_lists.mem_head = ctrl->mem_head;
-                        res_lists.p_mem_head = ctrl->p_mem_head;
-                        res_lists.bus_head = ctrl->bus_head;
-
-                        dbg("Returning resources to ctlr lists for (B/D/F) = (%#x/%#x/%#x)\n", 
-                                func->bus, func->device, func->function);
-
-                        pciehp_return_board_resources(func, &res_lists);
-
-                        ctrl->io_head = res_lists.io_head;
-                        ctrl->mem_head = res_lists.mem_head;
-                        ctrl->p_mem_head = res_lists.p_mem_head;
-                        ctrl->bus_head = res_lists.bus_head;
-
-                        pciehp_resource_sort_and_combine(&(ctrl->mem_head));
-                        pciehp_resource_sort_and_combine(&(ctrl->p_mem_head));
-                        pciehp_resource_sort_and_combine(&(ctrl->io_head));
-                        pciehp_resource_sort_and_combine(&(ctrl->bus_head));
-
-                        if (is_bridge(func)) {
-                                dbg("PCI Bridge Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n", 
-                                        ctrl->seg, func->bus, func->device, func->function);
-                                bridge_slot_remove(func);
-                        } else {
-                                dbg("PCI Function Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n", 
-                                        ctrl->seg, func->bus, func->device, func->function);
-                                slot_remove(func);
-                        }
-
-                        func = pciehp_slot_find(ctrl->slot_bus, device, 0);
-                }
-
-                /* Setup slot structure with entry for empty slot */
-                func = pciehp_slot_create(ctrl->slot_bus);
-
-                if (func == NULL) {
-                        return 1;
-                }
-
-                func->bus = ctrl->slot_bus;
-                func->device = device;
-                func->function = 0;
-                func->configured = 0;
-                func->switch_save = 0x10;
-                func->is_a_board = 0;
-        }
-
         return 0;
 }
 
@@ -1411,13 +444,15 @@ static void pciehp_pushbutton_thread(unsigned long slot)
         p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
         if (getstatus) {
                 p_slot->state = POWEROFF_STATE;
-                dbg("In power_down_board, b:d(%x:%x)\n", p_slot->bus, p_slot->device);
+                dbg("%s: disabling bus:device(%x:%x)\n", __FUNCTION__,
+                                p_slot->bus, p_slot->device);
 
                 pciehp_disable_slot(p_slot);
                 p_slot->state = STATIC_STATE;
         } else {
                 p_slot->state = POWERON_STATE;
-                dbg("In add_board, b:d(%x:%x)\n", p_slot->bus, p_slot->device);
+                dbg("%s: adding bus:device(%x:%x)\n", __FUNCTION__,
+                                p_slot->bus, p_slot->device);
 
                 if (pciehp_enable_slot(p_slot) && PWR_LED(p_slot->ctrl->ctrlcap)) {
                         /* Wait for exclusive access to hardware */
@@ -1459,13 +494,15 @@ static void pciehp_surprise_rm_thread(unsigned long slot)
         p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
         if (!getstatus) {
                 p_slot->state = POWEROFF_STATE;
-                dbg("In removing board, b:d(%x:%x)\n", p_slot->bus, p_slot->device);
+                dbg("%s: removing bus:device(%x:%x)\n",
+                                __FUNCTION__, p_slot->bus, p_slot->device);
 
                 pciehp_disable_slot(p_slot);
                 p_slot->state = STATIC_STATE;
         } else {
                 p_slot->state = POWERON_STATE;
-                dbg("In add_board, b:d(%x:%x)\n", p_slot->bus, p_slot->device);
+                dbg("%s: adding bus:device(%x:%x)\n",
+                                __FUNCTION__, p_slot->bus, p_slot->device);
 
                 if (pciehp_enable_slot(p_slot) && PWR_LED(p_slot->ctrl->ctrlcap)) {
                         /* Wait for exclusive access to hardware */
@@ -1531,7 +568,6 @@ int pciehp_event_start_thread(void)
                 err ("Can't start up our event thread\n");
                 return -1;
         }
-        dbg("Our event thread pid = %d\n", pid);
         return 0;
 }
 
@@ -1539,9 +575,7 @@ int pciehp_event_start_thread(void)
 void pciehp_event_stop_thread(void)
 {
         event_finished = 1;
-        dbg("event_thread finish command given\n");
         up(&event_semaphore);
-        dbg("wait for event_thread to exit\n");
         down(&event_exit);
 }
 
@@ -1573,7 +607,6 @@ static void interrupt_event_handler(struct controller *ctrl)
 {
         int loop = 0;
         int change = 1;
-        struct pci_func *func;
         u8 hp_slot;
         u8 getstatus;
         struct slot *p_slot;
@@ -1581,16 +614,12 @@ static void interrupt_event_handler(struct controller *ctrl)
         while (change) {
                 change = 0;
 
-                for (loop = 0; loop < 10; loop++) {
+                for (loop = 0; loop < MAX_EVENTS; loop++) {
                         if (ctrl->event_queue[loop].event_type != 0) {
                                 hp_slot = ctrl->event_queue[loop].hp_slot;
 
-                                func = pciehp_slot_find(ctrl->slot_bus, (hp_slot + ctrl->slot_device_offset), 0);
-
                                 p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
-                                dbg("hp_slot %d, func %p, p_slot %p\n", hp_slot, func, p_slot);
-
                                 if (ctrl->event_queue[loop].event_type == INT_BUTTON_CANCEL) {
                                         dbg("button cancel\n");
                                         del_timer(&p_slot->task_event);
@@ -1682,7 +711,6 @@ static void interrupt_event_handler(struct controller *ctrl)
                                                 p_slot->task_event.function = (void (*)(unsigned long)) pushbutton_helper_thread;
                                                 p_slot->task_event.data = (unsigned long) p_slot;
 
-                                                dbg("add_timer p_slot = %p\n", (void *) p_slot);
                                                 add_timer(&p_slot->task_event);
                                         }
                                 }
@@ -1737,13 +765,6 @@ int pciehp_enable_slot(struct slot *p_slot)
 {
         u8 getstatus = 0;
         int rc;
-        struct pci_func *func;
-
-        func = pciehp_slot_find(p_slot->bus, p_slot->device, 0);
-        if (!func) {
-                dbg("%s: Error! slot NULL\n", __FUNCTION__);
-                return 1;
-        }
 
         /* Check to see if (latch closed, card present, power off) */
         down(&p_slot->ctrl->crit_sect);
@@ -1773,45 +794,11 @@ int pciehp_enable_slot(struct slot *p_slot)
         }
         up(&p_slot->ctrl->crit_sect);
 
-        slot_remove(func);
-
-        func = pciehp_slot_create(p_slot->bus);
-        if (func == NULL)
-                return 1;
-
-        func->bus = p_slot->bus;
-        func->device = p_slot->device;
-        func->function = 0;
-        func->configured = 0;
-        func->is_a_board = 1;
-
-        /* We have to save the presence info for these slots */
-        p_slot->hpc_ops->get_adapter_status(p_slot, &(func->presence_save));
         p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
-        func->switch_save = !getstatus? 0x10:0;
 
-        rc = board_added(func, p_slot->ctrl);
+        rc = board_added(p_slot);
         if (rc) {
-                if (is_bridge(func))
-                        bridge_slot_remove(func);
-                else
-                        slot_remove(func);
-
-                /* Setup slot structure with entry for empty slot */
-                func = pciehp_slot_create(p_slot->bus);
-                if (func == NULL)
-                        return 1;       /* Out of memory */
-
-                func->bus = p_slot->bus;
-                func->device = p_slot->device;
-                func->function = 0;
-                func->configured = 0;
-                func->is_a_board = 1;
-
-                /* We have to save the presence info for these slots */
-                p_slot->hpc_ops->get_adapter_status(p_slot, &(func->presence_save));
                 p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
-                func->switch_save = !getstatus? 0x10:0;
         }
 
         if (p_slot)
@@ -1823,14 +810,8 @@ int pciehp_enable_slot(struct slot *p_slot)
 
 int pciehp_disable_slot(struct slot *p_slot)
 {
-        u8 class_code, header_type, BCR;
-        u8 index = 0;
         u8 getstatus = 0;
-        u32 rc = 0;
         int ret = 0;
-        unsigned int devfn;
-        struct pci_bus *pci_bus = p_slot->ctrl->pci_dev->subordinate;
-        struct pci_func *func;
 
         if (!p_slot->ctrl)
                 return 1;
@@ -1867,838 +848,8 @@ int pciehp_disable_slot(struct slot *p_slot)
 
         up(&p_slot->ctrl->crit_sect);
 
-        func = pciehp_slot_find(p_slot->bus, p_slot->device, index++);
-
-        /* Make sure there are no video controllers here
-         * for all func of p_slot
-         */
-        while (func && !rc) {
-                pci_bus->number = func->bus;
-                devfn = PCI_DEVFN(func->device, func->function);
-
-                /* Check the Class Code */
-                rc = pci_bus_read_config_byte (pci_bus, devfn, 0x0B, &class_code);
-                if (rc)
-                        return rc;
-
-                if (class_code == PCI_BASE_CLASS_DISPLAY) {
-                        /* Display/Video adapter (not supported) */
-                        rc = REMOVE_NOT_SUPPORTED;
-                } else {
-                        /* See if it's a bridge */
-                        rc = pci_bus_read_config_byte (pci_bus, devfn, PCI_HEADER_TYPE, &header_type);
-                        if (rc)
-                                return rc;
-
-                        /* If it's a bridge, check the VGA Enable bit */
-                        if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {
-                                rc = pci_bus_read_config_byte (pci_bus, devfn, PCI_BRIDGE_CONTROL, &BCR);
-                                if (rc)
-                                        return rc;
-
-                                /* If the VGA Enable bit is set, remove isn't supported */
-                                if (BCR & PCI_BRIDGE_CTL_VGA) {
-                                        rc = REMOVE_NOT_SUPPORTED;
-                                }
-                        }
-                }
-
-                func = pciehp_slot_find(p_slot->bus, p_slot->device, index++);
-        }
-
-        func = pciehp_slot_find(p_slot->bus, p_slot->device, 0);
-        if ((func != NULL) && !rc) {
-                rc = remove_board(func, p_slot->ctrl);
-        } else if (!rc)
-                rc = 1;
-
-        if (p_slot)
-                update_slot_info(p_slot);
-
-        return rc;
-}
-
-
-/**
- * configure_new_device - Configures the PCI header information of one board.
- *
- * @ctrl: pointer to controller structure
- * @func: pointer to function structure
- * @behind_bridge: 1 if this is a recursive call, 0 if not
- * @resources: pointer to set of resource lists
- *
- * Returns 0 if success
- *
- */
-static u32 configure_new_device(struct controller * ctrl, struct pci_func * func,
-        u8 behind_bridge, struct resource_lists * resources, u8 bridge_bus, u8 bridge_dev)
-{
-        u8 temp_byte, function, max_functions, stop_it;
-        int rc;
-        u32 ID;
-        struct pci_func *new_slot;
-        struct pci_bus lpci_bus, *pci_bus;
-        int index;
-
-        new_slot = func;
-
-        dbg("%s\n", __FUNCTION__);
-        memcpy(&lpci_bus, ctrl->pci_dev->subordinate, sizeof(lpci_bus));
-        pci_bus = &lpci_bus;
-        pci_bus->number = func->bus;
-
-        /* Check for Multi-function device */
-        rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(func->device, func->function), 0x0E, &temp_byte);
-        if (rc) {
-                dbg("%s: rc = %d\n", __FUNCTION__, rc);
-                return rc;
-        }
-
-        if (temp_byte & 0x80)   /* Multi-function device */
-                max_functions = 8;
-        else
-                max_functions = 1;
-
-        function = 0;
-
-        do {
-                rc = configure_new_function(ctrl, new_slot, behind_bridge,
-                                        resources, bridge_bus, bridge_dev);
-
-                if (rc) {
-                        dbg("configure_new_function failed: %d\n", rc);
-                        index = 0;
-
-                        while (new_slot) {
-                                new_slot = pciehp_slot_find(new_slot->bus,
-                                                new_slot->device, index++);
-
-                                if (new_slot)
-                                        pciehp_return_board_resources(new_slot,
-                                                resources);
-                        }
-
-                        return rc;
-                }
-
-                function++;
-
-                stop_it = 0;
-
-                /*  The following loop skips to the next present function
-                 *  and creates a board structure
-                 */
-
-                while ((function < max_functions) && (!stop_it)) {
-                        pci_bus_read_config_dword(pci_bus, PCI_DEVFN(func->device, function), 0x00, &ID);
-
-                        if (ID == 0xFFFFFFFF) {   /* There's nothing there. */
-                                function++;
-                        } else {  /* There's something there */
-                                /* Setup slot structure. */
-                                new_slot = pciehp_slot_create(func->bus);
-
-                                if (new_slot == NULL) {
-                                        /* Out of memory */
-                                        return 1;
-                                }
-
-                                new_slot->bus = func->bus;
-                                new_slot->device = func->device;
-                                new_slot->function = function;
-                                new_slot->is_a_board = 1;
-                                new_slot->status = 0;
-
-                                stop_it++;
-                        }
-                }
-
-        } while (function < max_functions);
-        dbg("returning from %s\n", __FUNCTION__);
-
-        return 0;
-}
-
-/*
- * Configuration logic that involves the hotplug data structures and 
- * their bookkeeping
- */
-
-/**
- * configure_bridge: fill bridge's registers, either configure or disable it.
- */
-static int
-configure_bridge(struct pci_bus *pci_bus, unsigned int devfn,
-                        struct pci_resource *mem_node,
-                        struct pci_resource **hold_mem_node,
-                        int base_addr, int limit_addr)
-{
-        u16 temp_word;
-        u32 rc;
-
-        if (mem_node) {
-                memcpy(*hold_mem_node, mem_node, sizeof(struct pci_resource));
-                mem_node->next = NULL;
-
-                /* set Mem base and Limit registers */
-                RES_CHECK(mem_node->base, 16);
-                temp_word = (u16)(mem_node->base >> 16);
-                rc = pci_bus_write_config_word(pci_bus, devfn, base_addr, temp_word);
-
-                RES_CHECK(mem_node->base + mem_node->length - 1, 16);
-                temp_word = (u16)((mem_node->base + mem_node->length - 1) >> 16);
-                rc = pci_bus_write_config_word(pci_bus, devfn, limit_addr, temp_word);
-        } else {
-                temp_word = 0xFFFF;
-                rc = pci_bus_write_config_word(pci_bus, devfn, base_addr, temp_word);
-
-                temp_word = 0x0000;
-                rc = pci_bus_write_config_word(pci_bus, devfn, limit_addr, temp_word);
-
-                kfree(*hold_mem_node);
-                *hold_mem_node = NULL;
-        }
-        return rc;
-}
-
-static int
-configure_new_bridge(struct controller *ctrl, struct pci_func *func,
-                u8 behind_bridge, struct resource_lists *resources,
-                struct pci_bus *pci_bus)
-{
-        int cloop;
-        u8 temp_byte;
-        u8 device;
-        u16 temp_word;
-        u32 rc;
-        u32 ID;
-        unsigned int devfn;
-        struct pci_resource *mem_node;
-        struct pci_resource *p_mem_node;
-        struct pci_resource *io_node;
-        struct pci_resource *bus_node;
-        struct pci_resource *hold_mem_node;
-        struct pci_resource *hold_p_mem_node;
-        struct pci_resource *hold_IO_node;
-        struct pci_resource *hold_bus_node;
-        struct irq_mapping irqs;
-        struct pci_func *new_slot;
-        struct resource_lists temp_resources;
-
-        devfn = PCI_DEVFN(func->device, func->function);
-
-        /* set Primary bus */
-        dbg("set Primary bus = 0x%x\n", func->bus);
-        rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_PRIMARY_BUS, func->bus);
-        if (rc)
-                return rc;
-
-        /* find range of busses to use */
-        bus_node = get_max_resource(&resources->bus_head, 1L);
-
-        /* If we don't have any busses to allocate, we can't continue */
-        if (!bus_node) {
-                err("Got NO bus resource to use\n");
-                return -ENOMEM;
-        }
-        dbg("Got ranges of buses to use: base:len=0x%x:%x\n", bus_node->base, bus_node->length);
-
-        /* set Secondary bus */
-        temp_byte = (u8)bus_node->base;
-        dbg("set Secondary bus = 0x%x\n", temp_byte);
-        rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_SECONDARY_BUS, temp_byte);
-        if (rc)
-                return rc;
-
-        /* set subordinate bus */
-        temp_byte = (u8)(bus_node->base + bus_node->length - 1);
-        dbg("set subordinate bus = 0x%x\n", temp_byte);
-        rc = pci_bus_write_config_byte (pci_bus, devfn, PCI_SUBORDINATE_BUS, temp_byte);
-        if (rc)
-                return rc;
-
-        /* Set HP parameters (Cache Line Size, Latency Timer) */
-        rc = pciehprm_set_hpp(ctrl, func, PCI_HEADER_TYPE_BRIDGE);
-        if (rc)
-                return rc;
-
-        /* Setup the IO, memory, and prefetchable windows */
-
-        io_node = get_max_resource(&(resources->io_head), 0x1000L);
-        if (io_node) {
-                dbg("io_node(base, len, next) (%x, %x, %p)\n", io_node->base,
-                                io_node->length, io_node->next);
-        }
-
-        mem_node = get_max_resource(&(resources->mem_head), 0x100000L);
-        if (mem_node) {
-                dbg("mem_node(base, len, next) (%x, %x, %p)\n", mem_node->base,
-                                mem_node->length, mem_node->next);
-        }
-
-        if (resources->p_mem_head)
-                p_mem_node = get_max_resource(&(resources->p_mem_head), 0x100000L);
-        else {
-                /*
-                 * In some platform implementation, MEM and PMEM are not
-                 *  distinguished, and hence ACPI _CRS has only MEM entries
-                 *  for both MEM and PMEM.
-                 */
-                dbg("using MEM for PMEM\n");
-                p_mem_node = get_max_resource(&(resources->mem_head), 0x100000L);
-        }
-        if (p_mem_node) {
-                dbg("p_mem_node(base, len, next) (%x, %x, %p)\n", p_mem_node->base,
-                                p_mem_node->length, p_mem_node->next);
-        }
-
-        /* set up the IRQ info */
-        if (!resources->irqs) {
-                irqs.barber_pole = 0;
-                irqs.interrupt[0] = 0;
-                irqs.interrupt[1] = 0;
-                irqs.interrupt[2] = 0;
-                irqs.interrupt[3] = 0;
-                irqs.valid_INT = 0;
-        } else {
-                irqs.barber_pole = resources->irqs->barber_pole;
-                irqs.interrupt[0] = resources->irqs->interrupt[0];
-                irqs.interrupt[1] = resources->irqs->interrupt[1];
-                irqs.interrupt[2] = resources->irqs->interrupt[2];
-                irqs.interrupt[3] = resources->irqs->interrupt[3];
-                irqs.valid_INT = resources->irqs->valid_INT;
-        }
-
-        /* set up resource lists that are now aligned on top and bottom
-         * for anything behind the bridge.
-         */
-        temp_resources.bus_head = bus_node;
-        temp_resources.io_head = io_node;
-        temp_resources.mem_head = mem_node;
-        temp_resources.p_mem_head = p_mem_node;
-        temp_resources.irqs = &irqs;
-
-        /* Make copies of the nodes we are going to pass down so that
-         * if there is a problem,we can just use these to free resources
-         */
-        hold_bus_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-        hold_IO_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-        hold_mem_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-        hold_p_mem_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-
-        if (!hold_bus_node || !hold_IO_node || !hold_mem_node || !hold_p_mem_node) {
-                kfree(hold_bus_node);
-                kfree(hold_IO_node);
-                kfree(hold_mem_node);
-                kfree(hold_p_mem_node);
-
-                return 1;
-        }
-
-        memcpy(hold_bus_node, bus_node, sizeof(struct pci_resource));
-
-        bus_node->base += 1;
-        bus_node->length -= 1;
-        bus_node->next = NULL;
-
-        /* If we have IO resources copy them and fill in the bridge's
-         * IO range registers
-         */
-        if (io_node) {
-                memcpy(hold_IO_node, io_node, sizeof(struct pci_resource));
-                io_node->next = NULL;
-
-                /* set IO base and Limit registers */
-                RES_CHECK(io_node->base, 8);
-                temp_byte = (u8)(io_node->base >> 8);
-                rc = pci_bus_write_config_byte (pci_bus, devfn, PCI_IO_BASE, temp_byte);
-
-                RES_CHECK(io_node->base + io_node->length - 1, 8);
-                temp_byte = (u8)((io_node->base + io_node->length - 1) >> 8);
-                rc = pci_bus_write_config_byte (pci_bus, devfn, PCI_IO_LIMIT, temp_byte);
-        } else {
-                kfree(hold_IO_node);
-                hold_IO_node = NULL;
-        }
-
-        /* If we have memory resources copy them and fill in the bridge's
-         * memory range registers.  Otherwise, fill in the range
-         * registers with values that disable them.
-         */
-        rc = configure_bridge(pci_bus, devfn, mem_node, &hold_mem_node,
-                                PCI_MEMORY_BASE, PCI_MEMORY_LIMIT);
-
-        /* If we have prefetchable memory resources copy them and 
-         * fill in the bridge's memory range registers.  Otherwise,
-         * fill in the range registers with values that disable them.
-         */
-        rc = configure_bridge(pci_bus, devfn, p_mem_node, &hold_p_mem_node,
-                                PCI_PREF_MEMORY_BASE, PCI_PREF_MEMORY_LIMIT);
-
-        /* Adjust this to compensate for extra adjustment in first loop */
-        irqs.barber_pole--;
-
-        rc = 0;
-
-        /* Here we actually find the devices and configure them */
-        for (device = 0; (device <= 0x1F) && !rc; device++) {
-                irqs.barber_pole = (irqs.barber_pole + 1) & 0x03;
-
-                ID = 0xFFFFFFFF;
-                pci_bus->number = hold_bus_node->base;
-                pci_bus_read_config_dword (pci_bus, PCI_DEVFN(device, 0), PCI_VENDOR_ID, &ID);
-                pci_bus->number = func->bus;
-
-                if (ID != 0xFFFFFFFF) {   /*  device Present */
-                        /* Setup slot structure. */
-                        new_slot = pciehp_slot_create(hold_bus_node->base);
-
-                        if (new_slot == NULL) {
-                                /* Out of memory */
-                                rc = -ENOMEM;
-                                continue;
-                        }
-
-                        new_slot->bus = hold_bus_node->base;
-                        new_slot->device = device;
-                        new_slot->function = 0;
-                        new_slot->is_a_board = 1;
-                        new_slot->status = 0;
-
-                        rc = configure_new_device(ctrl, new_slot, 1,
-                                        &temp_resources, func->bus,
-                                        func->device);
-                        dbg("configure_new_device rc=0x%x\n",rc);
-                }       /* End of IF (device in slot?) */
-        }               /* End of FOR loop */
-
-        if (rc) {
-                pciehp_destroy_resource_list(&temp_resources);
-
-                return_resource(&(resources->bus_head), hold_bus_node);
-                return_resource(&(resources->io_head), hold_IO_node);
-                return_resource(&(resources->mem_head), hold_mem_node);
-                return_resource(&(resources->p_mem_head), hold_p_mem_node);
-                return(rc);
-        }
-
-        /* save the interrupt routing information */
-        if (resources->irqs) {
-                resources->irqs->interrupt[0] = irqs.interrupt[0];
-                resources->irqs->interrupt[1] = irqs.interrupt[1];
-                resources->irqs->interrupt[2] = irqs.interrupt[2];
-                resources->irqs->interrupt[3] = irqs.interrupt[3];
-                resources->irqs->valid_INT = irqs.valid_INT;
-        } else if (!behind_bridge) {
-                /* We need to hook up the interrupts here */
-                for (cloop = 0; cloop < 4; cloop++) {
-                        if (irqs.valid_INT & (0x01 << cloop)) {
-                                rc = pciehp_set_irq(func->bus, func->device,
-                                                        0x0A + cloop, irqs.interrupt[cloop]);
-                                if (rc) {
-                                        pciehp_destroy_resource_list (&temp_resources);
-                                        return_resource(&(resources->bus_head), hold_bus_node);
-                                        return_resource(&(resources->io_head), hold_IO_node);
-                                        return_resource(&(resources->mem_head), hold_mem_node);
-                                        return_resource(&(resources->p_mem_head), hold_p_mem_node);
-                                        return rc;
-                                }
-                        }
-                }       /* end of for loop */
-        }
-
-        /* Return unused bus resources
-         * First use the temporary node to store information for the board
-         */
-        if (hold_bus_node && bus_node && temp_resources.bus_head) {
-                hold_bus_node->length = bus_node->base - hold_bus_node->base;
-
-                hold_bus_node->next = func->bus_head;
-                func->bus_head = hold_bus_node;
-
-                temp_byte = (u8)(temp_resources.bus_head->base - 1);
-
-                /* set subordinate bus */
-                dbg("re-set subordinate bus = 0x%x\n", temp_byte);
-                rc = pci_bus_write_config_byte (pci_bus, devfn, PCI_SUBORDINATE_BUS, temp_byte);
-
-                if (temp_resources.bus_head->length == 0) {
-                        kfree(temp_resources.bus_head);
-                        temp_resources.bus_head = NULL;
-                } else {
-                        dbg("return bus res of b:d(0x%x:%x) base:len(0x%x:%x)\n",
-                                func->bus, func->device, temp_resources.bus_head->base, temp_resources.bus_head->length);
-                        return_resource(&(resources->bus_head), temp_resources.bus_head);
-                }
-        }
-
-        /* If we have IO space available and there is some left,
-         * return the unused portion
-         */
-        if (hold_IO_node && temp_resources.io_head) {
-                io_node = do_pre_bridge_resource_split(&(temp_resources.io_head),
-                                                        &hold_IO_node, 0x1000);
-
-                /* Check if we were able to split something off */
-                if (io_node) {
-                        hold_IO_node->base = io_node->base + io_node->length;
-
-                        RES_CHECK(hold_IO_node->base, 8);
-                        temp_byte = (u8)((hold_IO_node->base) >> 8);
-                        rc = pci_bus_write_config_byte (pci_bus, devfn, PCI_IO_BASE, temp_byte);
-
-                        return_resource(&(resources->io_head), io_node);
-                }
-
-                io_node = do_bridge_resource_split(&(temp_resources.io_head), 0x1000);
-
-                /*  Check if we were able to split something off */
-                if (io_node) {
-                        /* First use the temporary node to store information for the board */
-                        hold_IO_node->length = io_node->base - hold_IO_node->base;
-
-                        /* If we used any, add it to the board's list */
-                        if (hold_IO_node->length) {
-                                hold_IO_node->next = func->io_head;
-                                func->io_head = hold_IO_node;
-
-                                RES_CHECK(io_node->base - 1, 8);
-                                temp_byte = (u8)((io_node->base - 1) >> 8);
-                                rc = pci_bus_write_config_byte (pci_bus, devfn, PCI_IO_LIMIT, temp_byte);
-
-                                return_resource(&(resources->io_head), io_node);
-                        } else {
-                                /* it doesn't need any IO */
-                                temp_byte = 0x00;
-                                rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_IO_LIMIT, temp_byte);
-
-                                return_resource(&(resources->io_head), io_node);
-                                kfree(hold_IO_node);
-                        }
-                } else {
-                        /* it used most of the range */
-                        hold_IO_node->next = func->io_head;
-                        func->io_head = hold_IO_node;
-                }
-        } else if (hold_IO_node) {
-                /* it used the whole range */
-                hold_IO_node->next = func->io_head;
-                func->io_head = hold_IO_node;
-        }
-
-        /* If we have memory space available and there is some left,
-         * return the unused portion
-         */
-        if (hold_mem_node && temp_resources.mem_head) {
-                mem_node = do_pre_bridge_resource_split(&(temp_resources.mem_head), &hold_mem_node, 0x100000L);
-
-                /* Check if we were able to split something off */
-                if (mem_node) {
-                        hold_mem_node->base = mem_node->base + mem_node->length;
-
-                        RES_CHECK(hold_mem_node->base, 16);
-                        temp_word = (u16)((hold_mem_node->base) >> 16);
-                        rc = pci_bus_write_config_word (pci_bus, devfn, PCI_MEMORY_BASE, temp_word);
-
-                        return_resource(&(resources->mem_head), mem_node);
-                }
-
-                mem_node = do_bridge_resource_split(&(temp_resources.mem_head), 0x100000L);
-
-                /* Check if we were able to split something off */
-                if (mem_node) {
-                        /* First use the temporary node to store information for the board */
-                        hold_mem_node->length = mem_node->base - hold_mem_node->base;
-
-                        if (hold_mem_node->length) {
-                                hold_mem_node->next = func->mem_head;
-                                func->mem_head = hold_mem_node;
-
-                                /* configure end address */
-                                RES_CHECK(mem_node->base - 1, 16);
-                                temp_word = (u16)((mem_node->base - 1) >> 16);
-                                rc = pci_bus_write_config_word (pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word);
-
-                                /* Return unused resources to the pool */
-                                return_resource(&(resources->mem_head), mem_node);
-                        } else {
-                                /* it doesn't need any Mem */
-                                temp_word = 0x0000;
-                                rc = pci_bus_write_config_word (pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word);
-
-                                return_resource(&(resources->mem_head), mem_node);
-                                kfree(hold_mem_node);
-                        }
-                } else {
-                        /* it used most of the range */
-                        hold_mem_node->next = func->mem_head;
-                        func->mem_head = hold_mem_node;
-                }
-        } else if (hold_mem_node) {
-                /* it used the whole range */
-                hold_mem_node->next = func->mem_head;
-                func->mem_head = hold_mem_node;
-        }
-
-        /* If we have prefetchable memory space available and there is some 
-         * left at the end, return the unused portion
-         */
-        if (hold_p_mem_node && temp_resources.p_mem_head) {
-                p_mem_node = do_pre_bridge_resource_split(&(temp_resources.p_mem_head),
-                                                                &hold_p_mem_node, 0x100000L);
-
-                /* Check if we were able to split something off */
-                if (p_mem_node) {
-                        hold_p_mem_node->base = p_mem_node->base + p_mem_node->length;
-
-                        RES_CHECK(hold_p_mem_node->base, 16);
-                        temp_word = (u16)((hold_p_mem_node->base) >> 16);
-                        rc = pci_bus_write_config_word (pci_bus, devfn, PCI_PREF_MEMORY_BASE, temp_word);
-
-                        return_resource(&(resources->p_mem_head), p_mem_node);
-                }
-
-                p_mem_node = do_bridge_resource_split(&(temp_resources.p_mem_head), 0x100000L);
-
-                /* Check if we were able to split something off */
-                if (p_mem_node) {
-                        /* First use the temporary node to store information for the board */
-                        hold_p_mem_node->length = p_mem_node->base - hold_p_mem_node->base;
-
-                        /* If we used any, add it to the board's list */
-                        if (hold_p_mem_node->length) {
-                                hold_p_mem_node->next = func->p_mem_head;
-                                func->p_mem_head = hold_p_mem_node;
-
-                                RES_CHECK(p_mem_node->base - 1, 16);
-                                temp_word = (u16)((p_mem_node->base - 1) >> 16);
-                                rc = pci_bus_write_config_word (pci_bus, devfn, PCI_PREF_MEMORY_LIMIT, temp_word);
-
-                                return_resource(&(resources->p_mem_head), p_mem_node);
-                        } else {
-                                /* it doesn't need any PMem */
-                                temp_word = 0x0000;
-                                rc = pci_bus_write_config_word (pci_bus, devfn, PCI_PREF_MEMORY_LIMIT, temp_word);
-
-                                return_resource(&(resources->p_mem_head), p_mem_node);
-                                kfree(hold_p_mem_node);
-                        }
-                } else {
-                        /* it used the most of the range */
-                        hold_p_mem_node->next = func->p_mem_head;
-                        func->p_mem_head = hold_p_mem_node;
-                }
-        } else if (hold_p_mem_node) {
-                /* it used the whole range */
-                hold_p_mem_node->next = func->p_mem_head;
-                func->p_mem_head = hold_p_mem_node;
-        }
-
-        /* We should be configuring an IRQ and the bridge's base address
-         * registers if it needs them.  Although we have never seen such
-         * a device
-         */
-
-        pciehprm_enable_card(ctrl, func, PCI_HEADER_TYPE_BRIDGE);
-
-        dbg("PCI Bridge Hot-Added s:b:d:f(%02x:%02x:%02x:%02x)\n", ctrl->seg, func->bus, func->device, func->function);
-
-        return rc;
+        ret = remove_board(p_slot);
+        update_slot_info(p_slot);
+        return ret;
 }
 
-/**
- * configure_new_function - Configures the PCI header information of one device
- *
- * @ctrl: pointer to controller structure
- * @func: pointer to function structure
- * @behind_bridge: 1 if this is a recursive call, 0 if not
- * @resources: pointer to set of resource lists
- *
- * Calls itself recursively for bridged devices.
- * Returns 0 if success
- *
- */
-static int
-configure_new_function(struct controller *ctrl, struct pci_func *func,
-                u8 behind_bridge, struct resource_lists *resources,
-                u8 bridge_bus, u8 bridge_dev)
-{
-        int cloop;
-        u8 temp_byte;
-        u8 class_code;
-        u32 rc;
-        u32 temp_register;
-        u32 base;
-        unsigned int devfn;
-        struct pci_resource *mem_node;
-        struct pci_resource *io_node;
-        struct pci_bus lpci_bus, *pci_bus;
-
-        memcpy(&lpci_bus, ctrl->pci_dev->subordinate, sizeof(lpci_bus));
-        pci_bus = &lpci_bus;
-        pci_bus->number = func->bus;
-        devfn = PCI_DEVFN(func->device, func->function);
-
-        /* Check for Bridge */
-        rc = pci_bus_read_config_byte(pci_bus, devfn, PCI_HEADER_TYPE, &temp_byte);
-        if (rc)
-                return rc;
-        dbg("%s: bus %x dev %x func %x temp_byte = %x\n", __FUNCTION__,
-                func->bus, func->device, func->function, temp_byte);
-
-        if ((temp_byte & 0x7F) == PCI_HEADER_TYPE_BRIDGE) { /* PCI-PCI Bridge */
-                rc = configure_new_bridge(ctrl, func, behind_bridge, resources,
-                                                pci_bus);
-
-                if (rc)
-                        return rc;
-        } else if ((temp_byte & 0x7F) == PCI_HEADER_TYPE_NORMAL) {
-                /* Standard device */
-                u64     base64;
-                rc = pci_bus_read_config_byte(pci_bus, devfn, 0x0B, &class_code);
-
-                if (class_code == PCI_BASE_CLASS_DISPLAY)
-                        return DEVICE_TYPE_NOT_SUPPORTED;
-
-                /* Figure out IO and memory needs */
-                for (cloop = PCI_BASE_ADDRESS_0; cloop <= PCI_BASE_ADDRESS_5; cloop += 4) {
-                        temp_register = 0xFFFFFFFF;
-
-                        rc = pci_bus_write_config_dword (pci_bus, devfn, cloop, temp_register);
-                        rc = pci_bus_read_config_dword(pci_bus, devfn, cloop, &temp_register);
-                        dbg("Bar[%x]=0x%x on bus:dev:func(0x%x:%x:%x)\n", cloop, temp_register, 
-                                func->bus, func->device, func->function);
-
-                        if (!temp_register)
-                                continue;
-
-                        base64 = 0L;
-                        if (temp_register & PCI_BASE_ADDRESS_SPACE_IO) {
-                                /* Map IO */
-
-                                /* set base = amount of IO space */
-                                base = temp_register & 0xFFFFFFFC;
-                                base = ~base + 1;
-
-                                dbg("NEED IO length(0x%x)\n", base);
-                                io_node = get_io_resource(&(resources->io_head),(ulong)base);
-
-                                /* allocate the resource to the board */
-                                if (io_node) {
-                                        dbg("Got IO base=0x%x(length=0x%x)\n", io_node->base, io_node->length);
-                                        base = (u32)io_node->base;
-                                        io_node->next = func->io_head;
-                                        func->io_head = io_node;
-                                } else {
-                                        err("Got NO IO resource(length=0x%x)\n", base);
-                                        return -ENOMEM;
-                                }
-                        } else {        /* map MEM */
-                                int prefetchable = 1;
-                                struct pci_resource **res_node = &func->p_mem_head;
-                                char *res_type_str = "PMEM";
-                                u32     temp_register2;
-
-                                if (!(temp_register & PCI_BASE_ADDRESS_MEM_PREFETCH)) {
-                                        prefetchable = 0;
-                                        res_node = &func->mem_head;
-                                        res_type_str++;
-                                }
-
-                                base = temp_register & 0xFFFFFFF0;
-                                base = ~base + 1;
-
-                                switch (temp_register & PCI_BASE_ADDRESS_MEM_TYPE_MASK) {
-                                case PCI_BASE_ADDRESS_MEM_TYPE_32:
-                                        dbg("NEED 32 %s bar=0x%x(length=0x%x)\n", res_type_str, temp_register, base);
-
-                                        if (prefetchable && resources->p_mem_head)
-                                                mem_node=get_resource(&(resources->p_mem_head), (ulong)base);
-                                        else {
-                                                if (prefetchable)
-                                                        dbg("using MEM for PMEM\n");
-                                                mem_node = get_resource(&(resources->mem_head), (ulong)base);
-                                        }
-
-                                        /* allocate the resource to the board */
-                                        if (mem_node) {
-                                                base = (u32)mem_node->base; 
-                                                mem_node->next = *res_node;
-                                                *res_node = mem_node;
-                                                dbg("Got 32 %s base=0x%x(length=0x%x)\n", res_type_str, mem_node->base, 
-                                                        mem_node->length);
-                                        } else {
-                                                err("Got NO 32 %s resource(length=0x%x)\n", res_type_str, base);
-                                                return -ENOMEM;
-                                        }
-                                        break;
-                                case PCI_BASE_ADDRESS_MEM_TYPE_64:
-                                        rc = pci_bus_read_config_dword(pci_bus, devfn, cloop+4, &temp_register2);
-                                        dbg("NEED 64 %s bar=0x%x:%x(length=0x%x)\n", res_type_str, temp_register2, 
-                                                temp_register, base);
-
-                                        if (prefetchable && resources->p_mem_head)
-                                                mem_node = get_resource(&(resources->p_mem_head), (ulong)base);
-                                        else {
-                                                if (prefetchable)
-                                                        dbg("using MEM for PMEM\n");
-                                                mem_node = get_resource(&(resources->mem_head), (ulong)base);
-                                        }
-
-                                        /* allocate the resource to the board */
-                                        if (mem_node) {
-                                                base64 = mem_node->base; 
-                                                mem_node->next = *res_node;
-                                                *res_node = mem_node;
-                                                dbg("Got 64 %s base=0x%x:%x(length=%x)\n", res_type_str, (u32)(base64 >> 32), 
-                                                        (u32)base64, mem_node->length);
-                                        } else {
-                                                err("Got NO 64 %s resource(length=0x%x)\n", res_type_str, base);
-                                                return -ENOMEM;
-                                        }
-                                        break;
-                                default:
-                                        dbg("reserved BAR type=0x%x\n", temp_register);
-                                        break;
-                                }
-
-                        }
-
-                        if (base64) {
-                                rc = pci_bus_write_config_dword(pci_bus, devfn, cloop, (u32)base64);
-                                cloop += 4;
-                                base64 >>= 32;
-
-                                if (base64) {
-                                        dbg("%s: high dword of base64(0x%x) set to 0\n", __FUNCTION__, (u32)base64);
-                                        base64 = 0x0L;
-                                }
-
-                                rc = pci_bus_write_config_dword(pci_bus, devfn, cloop, (u32)base64);
-                        } else {
-                                rc = pci_bus_write_config_dword(pci_bus, devfn, cloop, base);
-                        }
-                }               /* End of base register loop */
-
-                /* disable ROM base Address */
-                rc = pci_bus_write_config_dword (pci_bus, devfn, PCI_ROM_ADDRESS, 0x00);
-
-                /* Set HP parameters (Cache Line Size, Latency Timer) */
-                rc = pciehprm_set_hpp(ctrl, func, PCI_HEADER_TYPE_NORMAL);
-                if (rc)
-                        return rc;
-
-                pciehprm_enable_card(ctrl, func, PCI_HEADER_TYPE_NORMAL);
-
-                dbg("PCI function Hot-Added s:b:d:f(%02x:%02x:%02x:%02x)\n", ctrl->seg, func->bus, func->device, 
-                        func->function);
-        }  /* End of Not-A-Bridge else */
-        else {
-                /* It's some strange type of PCI adapter (Cardbus?) */
-                return DEVICE_TYPE_NOT_SUPPORTED;
-        }
-
-        func->configured = 1;
-
-        return 0;
-}
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 7a0e27f0e063..4a3cecca012c 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -27,16 +27,10 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/interrupt.h>
-#include <linux/spinlock.h>
 #include <linux/pci.h>
-#include <asm/system.h>
 #include "../pci.h"
 #include "pciehp.h"
 
@@ -217,23 +211,6 @@ static int pcie_cap_base = 0;		/* Base of the PCI Express capability item struct
 #define MRL_STATE               0x0020
 #define PRSN_STATE              0x0040
 
-struct php_ctlr_state_s {
-        struct php_ctlr_state_s *pnext;
-        struct pci_dev *pci_dev;
-        unsigned int irq;
-        unsigned long flags;                            /* spinlock's */
-        u32 slot_device_offset;
-        u32 num_slots;
-        struct timer_list       int_poll_timer;         /* Added for poll event */
-        php_intr_callback_t     attention_button_callback;
-        php_intr_callback_t     switch_change_callback;
-        php_intr_callback_t     presence_change_callback;
-        php_intr_callback_t     power_fault_callback;
-        void                    *callback_instance_id;
-        struct ctrl_reg         *creg;                          /* Ptr to controller register space */
-};
-
-
 static spinlock_t hpc_event_lock;
 
 DEFINE_DBG_BUFFER               /* Debug string buffer for entire HPC defined here */
@@ -297,7 +274,6 @@ static int pcie_write_cmd(struct slot *slot, u16 cmd)
 
         DBG_ENTER_ROUTINE 
         
-        dbg("%s : Enter\n", __FUNCTION__);
         if (!php_ctlr) {
                 err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
                 return -1;
@@ -308,7 +284,6 @@ static int pcie_write_cmd(struct slot *slot, u16 cmd)
                         err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
                         return retval;
                 }
-        dbg("%s : hp_register_read_word SLOT_STATUS %x\n", __FUNCTION__, slot_status);
         
         if ((slot_status & CMD_COMPLETED) == CMD_COMPLETED ) { 
                 /* After 1 sec and CMD_COMPLETED still not set, just proceed forward to issue 
@@ -316,14 +291,11 @@ static int pcie_write_cmd(struct slot *slot, u16 cmd)
                 dbg("%s : CMD_COMPLETED not clear after 1 sec.\n", __FUNCTION__);
         }
 
-        dbg("%s: Before hp_register_write_word SLOT_CTRL %x\n", __FUNCTION__, cmd);
         retval = hp_register_write_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), cmd | CMD_CMPL_INTR_ENABLE);
         if (retval) {
                 err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
                 return retval;
         }
-        dbg("%s : hp_register_write_word SLOT_CTRL %x\n", __FUNCTION__, cmd | CMD_CMPL_INTR_ENABLE);
-        dbg("%s : Exit\n", __FUNCTION__);
 
         DBG_LEAVE_ROUTINE 
         return retval;
@@ -509,7 +481,6 @@ static int hpc_query_power_fault(struct slot * slot)
         u16 slot_status;
         u8 pwr_fault;
         int retval = 0;
-        u8 status;
 
         DBG_ENTER_ROUTINE 
 
@@ -521,15 +492,13 @@ static int hpc_query_power_fault(struct slot * slot)
         retval = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(slot->ctrl->cap_base), slot_status);
 
         if (retval) {
-                err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
+                err("%s : Cannot check for power fault\n", __FUNCTION__);
                 return retval;
         }
         pwr_fault = (u8)((slot_status & PWR_FAULT_DETECTED) >> 1);
-        status = (pwr_fault != 1) ? 1 : 0;
         
         DBG_LEAVE_ROUTINE
-        /* Note: Logic 0 => fault */
-        return status;
+        return pwr_fault;
 }
 
 static int hpc_set_attention_status(struct slot *slot, u8 value)
@@ -539,7 +508,8 @@ static int hpc_set_attention_status(struct slot *slot, u8 value)
         u16 slot_ctrl;
         int rc = 0;
 
-        dbg("%s: \n", __FUNCTION__);
+        DBG_ENTER_ROUTINE
+
         if (!php_ctlr) {
                 err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
                 return -1;
@@ -555,7 +525,6 @@ static int hpc_set_attention_status(struct slot *slot, u8 value)
                 err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
                 return rc;
         }
-        dbg("%s : hp_register_read_word SLOT_CTRL %x\n", __FUNCTION__, slot_ctrl);
 
         switch (value) {
                 case 0 :        /* turn off */
@@ -576,6 +545,7 @@ static int hpc_set_attention_status(struct slot *slot, u8 value)
         pcie_write_cmd(slot, slot_cmd);
         dbg("%s: SLOT_CTRL %x write cmd %x\n", __FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_cmd);
         
+        DBG_LEAVE_ROUTINE
         return rc;
 }
 
@@ -587,7 +557,8 @@ static void hpc_set_green_led_on(struct slot *slot)
         u16 slot_ctrl;
         int rc = 0;
         
-        dbg("%s: \n", __FUNCTION__);    
+        DBG_ENTER_ROUTINE
+
         if (!php_ctlr) {
                 err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
                 return ;
@@ -604,7 +575,6 @@ static void hpc_set_green_led_on(struct slot *slot)
                 err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
                 return;
         }
-        dbg("%s : hp_register_read_word SLOT_CTRL %x\n", __FUNCTION__, slot_ctrl);
         slot_cmd = (slot_ctrl & ~PWR_LED_CTRL) | 0x0100;
         if (!pciehp_poll_mode)
                 slot_cmd = slot_cmd | HP_INTR_ENABLE; 
@@ -612,6 +582,7 @@ static void hpc_set_green_led_on(struct slot *slot)
         pcie_write_cmd(slot, slot_cmd);
 
         dbg("%s: SLOT_CTRL %x write cmd %x\n",__FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_cmd);
+        DBG_LEAVE_ROUTINE
         return;
 }
 
@@ -622,7 +593,8 @@ static void hpc_set_green_led_off(struct slot *slot)
         u16 slot_ctrl;
         int rc = 0;
 
-        dbg("%s: \n", __FUNCTION__);    
+        DBG_ENTER_ROUTINE
+
         if (!php_ctlr) {
                 err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
                 return ;
@@ -639,7 +611,6 @@ static void hpc_set_green_led_off(struct slot *slot)
                 err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
                 return;
         }
-        dbg("%s : hp_register_read_word SLOT_CTRL %x\n", __FUNCTION__, slot_ctrl);
 
         slot_cmd = (slot_ctrl & ~PWR_LED_CTRL) | 0x0300;
 
@@ -648,6 +619,7 @@ static void hpc_set_green_led_off(struct slot *slot)
         pcie_write_cmd(slot, slot_cmd);
         dbg("%s: SLOT_CTRL %x write cmd %x\n", __FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_cmd);
 
+        DBG_LEAVE_ROUTINE
         return;
 }
 
@@ -658,7 +630,8 @@ static void hpc_set_green_led_blink(struct slot *slot)
         u16 slot_ctrl;
         int rc = 0; 
         
-        dbg("%s: \n", __FUNCTION__);    
+        DBG_ENTER_ROUTINE
+
         if (!php_ctlr) {
                 err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
                 return ;
@@ -675,7 +648,6 @@ static void hpc_set_green_led_blink(struct slot *slot)
                 err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
                 return;
         }
-        dbg("%s : hp_register_read_word SLOT_CTRL %x\n", __FUNCTION__, slot_ctrl);
 
         slot_cmd = (slot_ctrl & ~PWR_LED_CTRL) | 0x0200;
 
@@ -684,6 +656,7 @@ static void hpc_set_green_led_blink(struct slot *slot)
         pcie_write_cmd(slot, slot_cmd);
 
         dbg("%s: SLOT_CTRL %x write cmd %x\n",__FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_cmd);
+        DBG_LEAVE_ROUTINE
         return;
 }
 
@@ -780,7 +753,6 @@ static int hpc_power_on_slot(struct slot * slot)
         int retval = 0;
 
         DBG_ENTER_ROUTINE 
-        dbg("%s: \n", __FUNCTION__);    
 
         if (!php_ctlr) {
                 err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
@@ -799,8 +771,6 @@ static int hpc_power_on_slot(struct slot * slot)
                 err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
                 return retval;
         }
-        dbg("%s: SLOT_CTRL %x, value read %xn", __FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base),
-                slot_ctrl);
 
         slot_cmd = (slot_ctrl & ~PWR_CTRL) | POWER_ON;
 
@@ -829,7 +799,6 @@ static int hpc_power_off_slot(struct slot * slot)
         int retval = 0;
 
         DBG_ENTER_ROUTINE 
-        dbg("%s: \n", __FUNCTION__);    
 
         if (!php_ctlr) {
                 err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
@@ -848,8 +817,6 @@ static int hpc_power_off_slot(struct slot * slot)
                 err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
                 return retval;
         }
-        dbg("%s: SLOT_CTRL %x, value read %x\n", __FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base),
-                slot_ctrl);
 
         slot_cmd = (slot_ctrl & ~PWR_CTRL) | POWER_OFF;
 
@@ -924,7 +891,6 @@ static irqreturn_t pcie_isr(int IRQ, void *dev_id, struct pt_regs *regs)
                         return IRQ_NONE;
                 }
 
-                dbg("%s: Set Mask Hot-plug Interrupt Enable\n", __FUNCTION__);
                 dbg("%s: hp_register_read_word SLOT_CTRL with value %x\n", __FUNCTION__, temp_word);
                 temp_word = (temp_word & ~HP_INTR_ENABLE & ~CMD_CMPL_INTR_ENABLE) | 0x00;
 
@@ -933,7 +899,6 @@ static irqreturn_t pcie_isr(int IRQ, void *dev_id, struct pt_regs *regs)
                         err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
                         return IRQ_NONE;
                 }
-                dbg("%s: hp_register_write_word SLOT_CTRL with value %x\n", __FUNCTION__, temp_word);
                 
                 rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), slot_status);
                 if (rc) {
@@ -949,14 +914,12 @@ static irqreturn_t pcie_isr(int IRQ, void *dev_id, struct pt_regs *regs)
                         err("%s : hp_register_write_word SLOT_STATUS failed\n", __FUNCTION__);
                         return IRQ_NONE;
                 }
-                dbg("%s: hp_register_write_word SLOT_STATUS with value %x\n", __FUNCTION__, temp_word);
         }
         
         if (intr_loc & CMD_COMPLETED) {
                 /* 
                  * Command Complete Interrupt Pending 
                  */
-                dbg("%s: In Command Complete Interrupt Pending\n", __FUNCTION__);
                 wake_up_interruptible(&ctrl->queue);
         }
 
@@ -989,7 +952,6 @@ static irqreturn_t pcie_isr(int IRQ, void *dev_id, struct pt_regs *regs)
                 }
 
                 dbg("%s: Unmask Hot-plug Interrupt Enable\n", __FUNCTION__);
-                dbg("%s: hp_register_read_word SLOT_CTRL with value %x\n", __FUNCTION__, temp_word);
                 temp_word = (temp_word & ~HP_INTR_ENABLE) | HP_INTR_ENABLE;
 
                 rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_CTRL(ctrl->cap_base), temp_word);
@@ -997,14 +959,12 @@ static irqreturn_t pcie_isr(int IRQ, void *dev_id, struct pt_regs *regs)
                         err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
                         return IRQ_NONE;
                 }
-                dbg("%s: hp_register_write_word SLOT_CTRL with value %x\n", __FUNCTION__, temp_word);   
         
                 rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), slot_status);
                 if (rc) {
                         err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
                         return IRQ_NONE;
                 }
-                dbg("%s: hp_register_read_word SLOT_STATUS with value %x\n", __FUNCTION__, slot_status); 
                 
                 /* Clear command complete interrupt caused by this write */
                 temp_word = 0x1F;
@@ -1248,12 +1208,7 @@ static struct hpc_ops pciehp_hpc_ops = {
         .check_lnk_status               = hpc_check_lnk_status,
 };
 
-int pcie_init(struct controller * ctrl,
-        struct pcie_device *dev,
-        php_intr_callback_t attention_button_callback,
-        php_intr_callback_t switch_change_callback,
-        php_intr_callback_t presence_change_callback,
-        php_intr_callback_t power_fault_callback)
+int pcie_init(struct controller * ctrl, struct pcie_device *dev)
 {
         struct php_ctlr_state_s *php_ctlr, *p;
         void *instance_id = ctrl;
@@ -1282,8 +1237,8 @@ int pcie_init(struct controller * ctrl,
         pdev = dev->port;
         php_ctlr->pci_dev = pdev;       /* save pci_dev in context */
 
-        dbg("%s: pdev->vendor %x pdev->device %x\n", __FUNCTION__,
-                pdev->vendor, pdev->device);
+        dbg("%s: hotplug controller vendor id 0x%x device id 0x%x\n",
+                        __FUNCTION__, pdev->vendor, pdev->device);
 
         saved_cap_base = pcie_cap_base;
 
@@ -1340,8 +1295,6 @@ int pcie_init(struct controller * ctrl,
                 first = 0;
         }
 
-        dbg("pdev = %p: b:d:f:irq=0x%x:%x:%x:%x\n", pdev, pdev->bus->number, 
-                PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn), dev->irq);
         for ( rc = 0; rc < DEVICE_COUNT_RESOURCE; rc++)
                 if (pci_resource_len(pdev, rc) > 0)
                         dbg("pci resource[%d] start=0x%lx(len=0x%lx)\n", rc,
@@ -1359,13 +1312,12 @@ int pcie_init(struct controller * ctrl,
 
         /* find the IRQ */
         php_ctlr->irq = dev->irq;
-        dbg("HPC interrupt = %d\n", php_ctlr->irq);
 
         /* Save interrupt callback info */
-        php_ctlr->attention_button_callback = attention_button_callback;
-        php_ctlr->switch_change_callback = switch_change_callback;
-        php_ctlr->presence_change_callback = presence_change_callback;
-        php_ctlr->power_fault_callback = power_fault_callback;
+        php_ctlr->attention_button_callback = pciehp_handle_attention_button;
+        php_ctlr->switch_change_callback = pciehp_handle_switch_change;
+        php_ctlr->presence_change_callback = pciehp_handle_presence_change;
+        php_ctlr->power_fault_callback = pciehp_handle_power_fault;
         php_ctlr->callback_instance_id = instance_id;
 
         /* return PCI Controller Info */
@@ -1387,15 +1339,12 @@ int pcie_init(struct controller * ctrl,
                 err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
                 goto abort_free_ctlr;
         }
-        dbg("%s : Mask HPIE hp_register_write_word SLOT_CTRL %x\n", __FUNCTION__, temp_word);
 
         rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), slot_status);
         if (rc) {
                 err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
                 goto abort_free_ctlr;
         }
-        dbg("%s: Mask HPIE SLOT_STATUS offset %x reads slot_status %x\n", __FUNCTION__, SLOT_STATUS(ctrl->cap_base)
-                , slot_status);
 
         temp_word = 0x1F; /* Clear all events */
         rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), temp_word);
@@ -1403,7 +1352,6 @@ int pcie_init(struct controller * ctrl,
                 err("%s : hp_register_write_word SLOT_STATUS failed\n", __FUNCTION__);
                 goto abort_free_ctlr;
         }
-        dbg("%s: SLOT_STATUS offset %x writes slot_status %x\n", __FUNCTION__, SLOT_STATUS(ctrl->cap_base), temp_word);
 
         if (pciehp_poll_mode)  {/* Install interrupt polling code */
                 /* Install and start the interrupt polling timer */
@@ -1419,13 +1367,14 @@ int pcie_init(struct controller * ctrl,
                 }
         }
 
+        dbg("pciehp ctrl b:d:f:irq=0x%x:%x:%x:%x\n", pdev->bus->number,
+                PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn), dev->irq);
+
         rc = hp_register_read_word(pdev, SLOT_CTRL(ctrl->cap_base), temp_word);
         if (rc) {
                 err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
                 goto abort_free_ctlr;
         }
-        dbg("%s: SLOT_CTRL %x value read %x\n", __FUNCTION__, SLOT_CTRL(ctrl->cap_base), temp_word);
-        dbg("%s: slot_cap %x\n", __FUNCTION__, slot_cap);
 
         intr_enable = intr_enable | PRSN_DETECT_ENABLE;
 
@@ -1445,7 +1394,6 @@ int pcie_init(struct controller * ctrl,
         } else {
                 temp_word = (temp_word & ~HP_INTR_ENABLE) | HP_INTR_ENABLE;
         }
-        dbg("%s: temp_word %x\n", __FUNCTION__, temp_word);
 
         /* Unmask Hot-plug Interrupt Enable for the interrupt notification mechanism case */
         rc = hp_register_write_word(pdev, SLOT_CTRL(ctrl->cap_base), temp_word);
@@ -1453,14 +1401,11 @@ int pcie_init(struct controller * ctrl,
                 err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
                 goto abort_free_ctlr;
         }
-        dbg("%s : Unmask HPIE hp_register_write_word SLOT_CTRL with %x\n", __FUNCTION__, temp_word);
         rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), slot_status);
         if (rc) {
                 err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
                 goto abort_free_ctlr;
         }
-        dbg("%s: Unmask HPIE SLOT_STATUS offset %x reads slot_status %x\n", __FUNCTION__, 
-                SLOT_STATUS(ctrl->cap_base), slot_status);
         
         temp_word =  0x1F; /* Clear all events */
         rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), temp_word);
@@ -1468,8 +1413,16 @@ int pcie_init(struct controller * ctrl,
                 err("%s : hp_register_write_word SLOT_STATUS failed\n", __FUNCTION__);
                 goto abort_free_ctlr;
         }
-        dbg("%s: SLOT_STATUS offset %x writes slot_status %x\n", __FUNCTION__, SLOT_STATUS(ctrl->cap_base), temp_word);
         
+        if (pciehp_force) {
+                dbg("Bypassing BIOS check for pciehp use on %s\n",
+                                pci_name(ctrl->pci_dev));
+        } else {
+                rc = pciehp_get_hp_hw_control_from_firmware(ctrl->pci_dev);
+                if (rc)
+                        goto abort_free_ctlr;
+        }
+
         /*  Add this HPC instance into the HPC list */
         spin_lock(&list_lock);
         if (php_ctlr_list_head == 0) {
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index ff17d8e07e94..647673a7d224 100644
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -27,801 +27,111 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/workqueue.h>
-#include <linux/proc_fs.h>
 #include <linux/pci.h>
 #include "../pci.h"
 #include "pciehp.h"
-#ifndef CONFIG_IA64
-#include "../../../arch/i386/pci/pci.h"    /* horrible hack showing how processor dependant we are... */
-#endif
 
 
-int pciehp_configure_device (struct controller* ctrl, struct pci_func* func)  
+int pciehp_configure_device(struct slot *p_slot)
 {
-        unsigned char bus;
-        struct pci_bus *child;
-        int num;
-
-        if (func->pci_dev == NULL)
-                func->pci_dev = pci_find_slot(func->bus, PCI_DEVFN(func->device, func->function));
-
-        /* Still NULL ? Well then scan for it ! */
-        if (func->pci_dev == NULL) {
-                dbg("%s: pci_dev still null. do pci_scan_slot\n", __FUNCTION__);
-
-                num = pci_scan_slot(ctrl->pci_dev->subordinate, PCI_DEVFN(func->device, func->function));
-
-                if (num)
-                        pci_bus_add_devices(ctrl->pci_dev->subordinate);
-                
-                func->pci_dev = pci_find_slot(func->bus, PCI_DEVFN(func->device, func->function));
-                if (func->pci_dev == NULL) {
-                        dbg("ERROR: pci_dev still null\n");
-                        return 0;
-                }
+        struct pci_dev *dev;
+        struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;
+        int num, fn;
+
+        dev = pci_find_slot(p_slot->bus, PCI_DEVFN(p_slot->device, 0));
+        if (dev) {
+                err("Device %s already exists at %x:%x, cannot hot-add\n",
+                                pci_name(dev), p_slot->bus, p_slot->device);
+                return -EINVAL;
         }
 
-        if (func->pci_dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                pci_read_config_byte(func->pci_dev, PCI_SECONDARY_BUS, &bus);
-                child = pci_add_new_bus(func->pci_dev->bus, (func->pci_dev), bus);
-                pci_do_scan_bus(child);
+        num = pci_scan_slot(parent, PCI_DEVFN(p_slot->device, 0));
+        if (num == 0) {
+                err("No new device found\n");
+                return -ENODEV;
+        }
 
+        for (fn = 0; fn < 8; fn++) {
+                if (!(dev = pci_find_slot(p_slot->bus,
+                                        PCI_DEVFN(p_slot->device, fn))))
+                        continue;
+                if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
+                        err("Cannot hot-add display device %s\n",
+                                        pci_name(dev));
+                        continue;
+                }
+                if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
+                                (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
+                        /* Find an unused bus number for the new bridge */
+                        struct pci_bus *child;
+                        unsigned char busnr, start = parent->secondary;
+                        unsigned char end = parent->subordinate;
+                        for (busnr = start; busnr <= end; busnr++) {
+                                if (!pci_find_bus(pci_domain_nr(parent),
+                                                        busnr))
+                                        break;
+                        }
+                        if (busnr >= end) {
+                                err("No free bus for hot-added bridge\n");
+                                continue;
+                        }
+                        child = pci_add_new_bus(parent, dev, busnr);
+                        if (!child) {
+                                err("Cannot add new bus for %s\n",
+                                                pci_name(dev));
+                                continue;
+                        }
+                        child->subordinate = pci_do_scan_bus(child);
+                        pci_bus_size_bridges(child);
+                }
+                /* TBD: program firmware provided _HPP values */
+                /* program_fw_provided_values(dev); */
         }
 
+        pci_bus_assign_resources(parent);
+        pci_bus_add_devices(parent);
+        pci_enable_bridges(parent);
         return 0;
 }
 
-
-int pciehp_unconfigure_device(struct pci_func* func) 
+int pciehp_unconfigure_device(struct slot *p_slot)
 {
         int rc = 0;
         int j;
-        struct pci_bus *pbus;
+        u8 bctl = 0;
 
-        dbg("%s: bus/dev/func = %x/%x/%x\n", __FUNCTION__, func->bus,
-                                func->device, func->function);
-        pbus = func->pci_dev->bus;
+        dbg("%s: bus/dev = %x/%x\n", __FUNCTION__, p_slot->bus,
+                                p_slot->device);
 
         for (j=0; j<8 ; j++) {
-                struct pci_dev* temp = pci_find_slot(func->bus,
-                                (func->device << 3) | j);
-                if (temp) {
-                        pci_remove_bus_device(temp);
+                struct pci_dev* temp = pci_find_slot(p_slot->bus,
+                                (p_slot->device << 3) | j);
+                if (!temp)
+                        continue;
+                if ((temp->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
+                        err("Cannot remove display device %s\n",
+                                        pci_name(temp));
+                        continue;
                 }
+                if (temp->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
+                        pci_read_config_byte(temp, PCI_BRIDGE_CONTROL, &bctl);
+                        if (bctl & PCI_BRIDGE_CTL_VGA) {
+                                err("Cannot remove display device %s\n",
+                                                pci_name(temp));
+                                continue;
+                        }
+                }
+                pci_remove_bus_device(temp);
         }
         /* 
          * Some PCI Express root ports require fixup after hot-plug operation.
          */
         if (pcie_mch_quirk) 
-                pci_fixup_device(pci_fixup_final, pbus->self);
+                pci_fixup_device(pci_fixup_final, p_slot->ctrl->pci_dev);
         
         return rc;
 }
 
-/*
- * pciehp_set_irq
- *
- * @bus_num: bus number of PCI device
- * @dev_num: device number of PCI device
- * @slot: pointer to u8 where slot number will be returned
- */
-int pciehp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num)
-{
-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_IO_APIC)
-        int rc;
-        u16 temp_word;
-        struct pci_dev fakedev;
-        struct pci_bus fakebus;
-
-        fakedev.devfn = dev_num << 3;
-        fakedev.bus = &fakebus;
-        fakebus.number = bus_num;
-        dbg("%s: dev %d, bus %d, pin %d, num %d\n",
-            __FUNCTION__, dev_num, bus_num, int_pin, irq_num);
-        rc = pcibios_set_irq_routing(&fakedev, int_pin - 0x0a, irq_num);
-        dbg("%s: rc %d\n", __FUNCTION__, rc);
-        if (!rc)
-                return !rc;
-
-        /* set the Edge Level Control Register (ELCR) */
-        temp_word = inb(0x4d0);
-        temp_word |= inb(0x4d1) << 8;
-
-        temp_word |= 0x01 << irq_num;
-
-        /* This should only be for x86 as it sets the Edge Level Control Register */
-        outb((u8) (temp_word & 0xFF), 0x4d0);
-        outb((u8) ((temp_word & 0xFF00) >> 8), 0x4d1);
-#endif
-        return 0;
-}
-
-/* More PCI configuration routines; this time centered around hotplug controller */
-
-
-/*
- * pciehp_save_config
- *
- * Reads configuration for all slots in a PCI bus and saves info.
- *
- * Note:  For non-hot plug busses, the slot # saved is the device #
- *
- * returns 0 if success
- */
-int pciehp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num)
-{
-        int rc;
-        u8 class_code;
-        u8 header_type;
-        u32 ID;
-        u8 secondary_bus;
-        struct pci_func *new_slot;
-        int sub_bus;
-        int max_functions;
-        int function;
-        u8 DevError;
-        int device = 0;
-        int cloop = 0;
-        int stop_it;
-        int index;
-        int is_hot_plug = num_ctlr_slots || first_device_num;
-        struct pci_bus lpci_bus, *pci_bus;
-        int FirstSupported, LastSupported;
-
-        dbg("%s: Enter\n", __FUNCTION__);
-
-        memcpy(&lpci_bus, ctrl->pci_dev->subordinate, sizeof(lpci_bus));
-        pci_bus = &lpci_bus;
-
-        dbg("%s: num_ctlr_slots = %d, first_device_num = %d\n", __FUNCTION__,
-                                num_ctlr_slots, first_device_num);
-
-        /*   Decide which slots are supported */
-        if (is_hot_plug) {
-                /*********************************
-                 *  is_hot_plug is the slot mask
-                 *********************************/
-                FirstSupported = first_device_num;
-                LastSupported = FirstSupported + num_ctlr_slots - 1;
-        } else {
-                FirstSupported = 0;
-                LastSupported = 0x1F;
-        }
-
-        dbg("FirstSupported = %d, LastSupported = %d\n", FirstSupported,
-                                        LastSupported);
-
-        /*   Save PCI configuration space for all devices in supported slots */
-        dbg("%s: pci_bus->number = %x\n", __FUNCTION__, pci_bus->number);
-        pci_bus->number = busnumber;
-        dbg("%s: bus = %x, dev = %x\n", __FUNCTION__, busnumber, device);
-        for (device = FirstSupported; device <= LastSupported; device++) {
-                ID = 0xFFFFFFFF;
-                rc = pci_bus_read_config_dword(pci_bus, PCI_DEVFN(device, 0),
-                                        PCI_VENDOR_ID, &ID);
-
-                if (ID != 0xFFFFFFFF) {   /*  device in slot */
-                        dbg("%s: ID = %x\n", __FUNCTION__, ID);
-                        rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, 0),
-                                        0x0B, &class_code);
-                        if (rc)
-                                return rc;
-
-                        rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, 0),
-                                        PCI_HEADER_TYPE, &header_type);
-                        if (rc)
-                                return rc;
-
-                        dbg("class_code = %x, header_type = %x\n", class_code, header_type);
-
-                        /* If multi-function device, set max_functions to 8 */
-                        if (header_type & 0x80)
-                                max_functions = 8;
-                        else
-                                max_functions = 1;
-
-                        function = 0;
-
-                        do {
-                                DevError = 0;
-                                dbg("%s: In do loop\n", __FUNCTION__);
-
-                                if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {   /* P-P Bridge */
-                                        /* Recurse the subordinate bus
-                                         * get the subordinate bus number
-                                         */
-                                        rc = pci_bus_read_config_byte(pci_bus,
-                                                PCI_DEVFN(device, function), 
-                                                PCI_SECONDARY_BUS, &secondary_bus);
-                                        if (rc) {
-                                                return rc;
-                                        } else {
-                                                sub_bus = (int) secondary_bus;
-
-                                                /* Save secondary bus cfg spc with this recursive call. */
-                                                rc = pciehp_save_config(ctrl, sub_bus, 0, 0);
-                                                if (rc)
-                                                        return rc;
-                                        }
-                                }
-
-                                index = 0;
-                                new_slot = pciehp_slot_find(busnumber, device, index++);
-
-                                dbg("%s: new_slot = %p bus %x dev %x fun %x\n",
-                                __FUNCTION__, new_slot, busnumber, device, index-1);
-
-                                while (new_slot && (new_slot->function != (u8) function)) {
-                                        new_slot = pciehp_slot_find(busnumber, device, index++);
-                                        dbg("%s: while loop, new_slot = %p bus %x dev %x fun %x\n",
-                                        __FUNCTION__, new_slot, busnumber, device, index-1);
-                                }
-                                if (!new_slot) {
-                                        /* Setup slot structure. */
-                                        new_slot = pciehp_slot_create(busnumber);
-                                        dbg("%s: if, new_slot = %p bus %x dev %x fun %x\n",
-                                        __FUNCTION__, new_slot, busnumber, device, function);
-
-                                        if (new_slot == NULL)
-                                                return(1);
-                                }
-
-                                new_slot->bus = (u8) busnumber;
-                                new_slot->device = (u8) device;
-                                new_slot->function = (u8) function;
-                                new_slot->is_a_board = 1;
-                                new_slot->switch_save = 0x10;
-                                /* In case of unsupported board */
-                                new_slot->status = DevError;
-                                new_slot->pci_dev = pci_find_slot(new_slot->bus,
-                                        (new_slot->device << 3) | new_slot->function);
-                                dbg("new_slot->pci_dev = %p\n", new_slot->pci_dev);
-
-                                for (cloop = 0; cloop < 0x20; cloop++) {
-                                        rc = pci_bus_read_config_dword(pci_bus,
-                                                PCI_DEVFN(device, function),
-                                                cloop << 2, 
-                                                (u32 *) &(new_slot->config_space [cloop]));
-                                        /* dbg("new_slot->config_space[%x] = %x\n",
-                                                cloop, new_slot->config_space[cloop]); */
-                                        if (rc)
-                                                return rc;
-                                }
-
-                                function++;
-
-                                stop_it = 0;
-
-                                /*  this loop skips to the next present function
-                                 *  reading in Class Code and Header type.
-                                 */
-
-                                while ((function < max_functions)&&(!stop_it)) {
-                                        dbg("%s: In while loop \n", __FUNCTION__);
-                                        rc = pci_bus_read_config_dword(pci_bus,
-                                                        PCI_DEVFN(device, function),
-                                                        PCI_VENDOR_ID, &ID);
-
-                                        if (ID == 0xFFFFFFFF) {  /* nothing there. */
-                                                function++;
-                                                dbg("Nothing there\n");
-                                        } else {  /* Something there */
-                                                rc = pci_bus_read_config_byte(pci_bus,
-                                                        PCI_DEVFN(device, function),
-                                                        0x0B, &class_code);
-                                                if (rc)
-                                                        return rc;
-
-                                                rc = pci_bus_read_config_byte(pci_bus,
-                                                        PCI_DEVFN(device, function),
-                                                        PCI_HEADER_TYPE, &header_type);
-                                                if (rc)
-                                                        return rc;
-
-                                                dbg("class_code = %x, header_type = %x\n", class_code, header_type);
-                                                stop_it++;
-                                        }
-                                }
-
-                        } while (function < max_functions);
-                        /* End of IF (device in slot?) */
-                } else if (is_hot_plug) {
-                        /* Setup slot structure with entry for empty slot */
-                        new_slot = pciehp_slot_create(busnumber);
-
-                        if (new_slot == NULL) {
-                                return(1);
-                        }
-                        dbg("new_slot = %p, bus = %x, dev = %x, fun = %x\n", new_slot,
-                                new_slot->bus, new_slot->device, new_slot->function);
-
-                        new_slot->bus = (u8) busnumber;
-                        new_slot->device = (u8) device;
-                        new_slot->function = 0;
-                        new_slot->is_a_board = 0;
-                        new_slot->presence_save = 0;
-                        new_slot->switch_save = 0;
-                }
-        }                       /* End of FOR loop */
-
-        dbg("%s: Exit\n", __FUNCTION__);
-        return(0);
-}
-
-
-/*
- * pciehp_save_slot_config
- *
- * Saves configuration info for all PCI devices in a given slot
- * including subordinate busses.
- *
- * returns 0 if success
- */
-int pciehp_save_slot_config(struct controller *ctrl, struct pci_func * new_slot)
-{
-        int rc;
-        u8 class_code;
-        u8 header_type;
-        u32 ID;
-        u8 secondary_bus;
-        int sub_bus;
-        int max_functions;
-        int function;
-        int cloop = 0;
-        int stop_it;
-        struct pci_bus lpci_bus, *pci_bus;
-        memcpy(&lpci_bus, ctrl->pci_dev->subordinate, sizeof(lpci_bus));
-        pci_bus = &lpci_bus;
-        pci_bus->number = new_slot->bus;
-
-        ID = 0xFFFFFFFF;
-
-        pci_bus_read_config_dword(pci_bus, PCI_DEVFN(new_slot->device, 0),
-                                        PCI_VENDOR_ID, &ID);
-
-        if (ID != 0xFFFFFFFF) {   /*  device in slot */
-                pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, 0),
-                                        0x0B, &class_code);
-
-                pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, 0),
-                                        PCI_HEADER_TYPE, &header_type);
-
-                if (header_type & 0x80) /* Multi-function device */
-                        max_functions = 8;
-                else
-                        max_functions = 1;
-
-                function = 0;
-
-                do {
-                        if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {     /* PCI-PCI Bridge */
-                                /*  Recurse the subordinate bus */
-                                pci_bus_read_config_byte(pci_bus,
-                                        PCI_DEVFN(new_slot->device, function), 
-                                        PCI_SECONDARY_BUS, &secondary_bus);
-
-                                sub_bus = (int) secondary_bus;
-
-                                /* Save the config headers for the secondary bus. */
-                                rc = pciehp_save_config(ctrl, sub_bus, 0, 0);
-
-                                if (rc)
-                                        return rc;
-
-                        }       /* End of IF */
-
-                        new_slot->status = 0;
-
-                        for (cloop = 0; cloop < 0x20; cloop++) {
-                                pci_bus_read_config_dword(pci_bus,
-                                        PCI_DEVFN(new_slot->device, function), 
-                                        cloop << 2,
-                                        (u32 *) &(new_slot->config_space [cloop]));
-                        }
-
-                        function++;
-
-                        stop_it = 0;
-
-                        /*  this loop skips to the next present function
-                         *  reading in the Class Code and the Header type.
-                         */
-
-                        while ((function < max_functions) && (!stop_it)) {
-                                pci_bus_read_config_dword(pci_bus,
-                                        PCI_DEVFN(new_slot->device, function),
-                                        PCI_VENDOR_ID, &ID);
-
-                                if (ID == 0xFFFFFFFF) {  /* nothing there. */
-                                        function++;
-                                } else {  /* Something there */
-                                        pci_bus_read_config_byte(pci_bus,
-                                                PCI_DEVFN(new_slot->device, function),
-                                                0x0B, &class_code);
-
-                                        pci_bus_read_config_byte(pci_bus,
-                                                PCI_DEVFN(new_slot->device, function),
-                                                PCI_HEADER_TYPE, &header_type);
-
-                                        stop_it++;
-                                }
-                        }
-
-                } while (function < max_functions);
-        }                       /* End of IF (device in slot?) */
-        else {
-                return 2;
-        }
-
-        return 0;
-}
-
-
-/*
- * pciehp_save_used_resources
- *
- * Stores used resource information for existing boards.  this is
- * for boards that were in the system when this driver was loaded.
- * this function is for hot plug ADD
- *
- * returns 0 if success
- * if disable  == 1(DISABLE_CARD),
- *  it loops for all functions of the slot and disables them.
- * else, it just get resources of the function and return.
- */
-int pciehp_save_used_resources(struct controller *ctrl, struct pci_func *func, int disable)
-{
-        u8 cloop;
-        u8 header_type;
-        u8 secondary_bus;
-        u8 temp_byte;
-        u16 command;
-        u16 save_command;
-        u16 w_base, w_length;
-        u32 temp_register;
-        u32 save_base;
-        u32 base, length;
-        u64 base64 = 0;
-        int index = 0;
-        unsigned int devfn;
-        struct pci_resource *mem_node = NULL;
-        struct pci_resource *p_mem_node = NULL;
-        struct pci_resource *t_mem_node;
-        struct pci_resource *io_node;
-        struct pci_resource *bus_node;
-        struct pci_bus lpci_bus, *pci_bus;
-        memcpy(&lpci_bus, ctrl->pci_dev->subordinate, sizeof(lpci_bus));
-        pci_bus = &lpci_bus;
-
-        if (disable)
-                func = pciehp_slot_find(func->bus, func->device, index++);
-
-        while ((func != NULL) && func->is_a_board) {
-                pci_bus->number = func->bus;
-                devfn = PCI_DEVFN(func->device, func->function);
-
-                /* Save the command register */
-                pci_bus_read_config_word(pci_bus, devfn, PCI_COMMAND, &save_command);
-
-                if (disable) {
-                        /* disable card */
-                        command = 0x00;
-                        pci_bus_write_config_word(pci_bus, devfn, PCI_COMMAND, command);
-                }
-
-                /* Check for Bridge */
-                pci_bus_read_config_byte(pci_bus, devfn, PCI_HEADER_TYPE, &header_type);
-
-                if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {     /* PCI-PCI Bridge */
-                        dbg("Save_used_res of PCI bridge b:d=0x%x:%x, sc=0x%x\n",
-                                        func->bus, func->device, save_command);
-                        if (disable) {
-                                /* Clear Bridge Control Register */
-                                command = 0x00;
-                                pci_bus_write_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, command);
-                        }
-
-                        pci_bus_read_config_byte(pci_bus, devfn, PCI_SECONDARY_BUS, &secondary_bus);
-                        pci_bus_read_config_byte(pci_bus, devfn, PCI_SUBORDINATE_BUS, &temp_byte);
-
-                        bus_node = kmalloc(sizeof(struct pci_resource),
-                                                GFP_KERNEL);
-                        if (!bus_node)
-                                return -ENOMEM;
-
-                        bus_node->base = (ulong)secondary_bus;
-                        bus_node->length = (ulong)(temp_byte - secondary_bus + 1);
-
-                        bus_node->next = func->bus_head;
-                        func->bus_head = bus_node;
-
-                        /* Save IO base and Limit registers */
-                        pci_bus_read_config_byte(pci_bus, devfn, PCI_IO_BASE, &temp_byte);
-                        base = temp_byte;
-                        pci_bus_read_config_byte(pci_bus, devfn, PCI_IO_LIMIT, &temp_byte);
-                        length = temp_byte;
-
-                        if ((base <= length) && (!disable || (save_command & PCI_COMMAND_IO))) {
-                                io_node = kmalloc(sizeof(struct pci_resource),
-                                                        GFP_KERNEL);
-                                if (!io_node)
-                                        return -ENOMEM;
-
-                                io_node->base = (ulong)(base & PCI_IO_RANGE_MASK) << 8;
-                                io_node->length = (ulong)(length - base + 0x10) << 8;
-
-                                io_node->next = func->io_head;
-                                func->io_head = io_node;
-                        }
-
-                        /* Save memory base and Limit registers */
-                        pci_bus_read_config_word(pci_bus, devfn, PCI_MEMORY_BASE, &w_base);
-                        pci_bus_read_config_word(pci_bus, devfn, PCI_MEMORY_LIMIT, &w_length);
-
-                        if ((w_base <= w_length) && (!disable || (save_command & PCI_COMMAND_MEMORY))) {
-                                mem_node = kmalloc(sizeof(struct pci_resource),
-                                                GFP_KERNEL);
-                                if (!mem_node)
-                                        return -ENOMEM;
-
-                                mem_node->base = (ulong)w_base << 16;
-                                mem_node->length = (ulong)(w_length - w_base + 0x10) << 16;
-
-                                mem_node->next = func->mem_head;
-                                func->mem_head = mem_node;
-                        }
-                        /* Save prefetchable memory base and Limit registers */
-                        pci_bus_read_config_word(pci_bus, devfn, PCI_PREF_MEMORY_BASE, &w_base);
-                        pci_bus_read_config_word(pci_bus, devfn, PCI_PREF_MEMORY_LIMIT, &w_length);
-
-                        if ((w_base <= w_length) && (!disable || (save_command & PCI_COMMAND_MEMORY))) {
-                                p_mem_node = kmalloc(sizeof(struct pci_resource),
-                                                GFP_KERNEL);
-                                if (!p_mem_node)
-                                        return -ENOMEM;
-
-                                p_mem_node->base = (ulong)w_base << 16;
-                                p_mem_node->length = (ulong)(w_length - w_base + 0x10) << 16;
-
-                                p_mem_node->next = func->p_mem_head;
-                                func->p_mem_head = p_mem_node;
-                        }
-                } else if ((header_type & 0x7F) == PCI_HEADER_TYPE_NORMAL) {
-                        dbg("Save_used_res of PCI adapter b:d=0x%x:%x, sc=0x%x\n",
-                                        func->bus, func->device, save_command);
-
-                        /* Figure out IO and memory base lengths */
-                        for (cloop = PCI_BASE_ADDRESS_0; cloop <= PCI_BASE_ADDRESS_5; cloop += 4) {
-                                pci_bus_read_config_dword(pci_bus, devfn, cloop, &save_base);
-
-                                temp_register = 0xFFFFFFFF;
-                                pci_bus_write_config_dword(pci_bus, devfn, cloop, temp_register);
-                                pci_bus_read_config_dword(pci_bus, devfn, cloop, &temp_register);
-
-                                if (!disable)
-                                        pci_bus_write_config_dword(pci_bus, devfn, cloop, save_base);
-
-                                if (!temp_register)
-                                        continue;
-
-                                base = temp_register;
-
-                                if ((base & PCI_BASE_ADDRESS_SPACE_IO) &&
-                                                (!disable || (save_command & PCI_COMMAND_IO))) {
-                                        /* IO base */
-                                        /* set temp_register = amount of IO space requested */
-                                        base = base & 0xFFFFFFFCL;
-                                        base = (~base) + 1;
-
-                                        io_node = kmalloc(sizeof (struct pci_resource),
-                                                                GFP_KERNEL);
-                                        if (!io_node)
-                                                return -ENOMEM;
-
-                                        io_node->base = (ulong)save_base & PCI_BASE_ADDRESS_IO_MASK;
-                                        io_node->length = (ulong)base;
-                                        dbg("sur adapter: IO bar=0x%x(length=0x%x)\n",
-                                                io_node->base, io_node->length);
-
-                                        io_node->next = func->io_head;
-                                        func->io_head = io_node;
-                                } else {  /* map Memory */
-                                        int prefetchable = 1;
-                                        /* struct pci_resources **res_node; */
-                                        char *res_type_str = "PMEM";
-                                        u32 temp_register2;
-
-                                        t_mem_node = kmalloc(sizeof (struct pci_resource),
-                                                                GFP_KERNEL);
-                                        if (!t_mem_node)
-                                                return -ENOMEM;
-
-                                        if (!(base & PCI_BASE_ADDRESS_MEM_PREFETCH) &&
-                                                        (!disable || (save_command & PCI_COMMAND_MEMORY))) {
-                                                prefetchable = 0;
-                                                mem_node = t_mem_node;
-                                                res_type_str++;
-                                        } else
-                                                p_mem_node = t_mem_node;
-
-                                        base = base & 0xFFFFFFF0L;
-                                        base = (~base) + 1;
-
-                                        switch (temp_register & PCI_BASE_ADDRESS_MEM_TYPE_MASK) {
-                                        case PCI_BASE_ADDRESS_MEM_TYPE_32:
-                                                if (prefetchable) {
-                                                        p_mem_node->base = (ulong)save_base & PCI_BASE_ADDRESS_MEM_MASK;
-                                                        p_mem_node->length = (ulong)base;
-                                                        dbg("sur adapter: 32 %s bar=0x%x(length=0x%x)\n",
-                                                                res_type_str, 
-                                                                p_mem_node->base,
-                                                                p_mem_node->length);
-
-                                                        p_mem_node->next = func->p_mem_head;
-                                                        func->p_mem_head = p_mem_node;
-                                                } else {
-                                                        mem_node->base = (ulong)save_base & PCI_BASE_ADDRESS_MEM_MASK;
-                                                        mem_node->length = (ulong)base;
-                                                        dbg("sur adapter: 32 %s bar=0x%x(length=0x%x)\n",
-                                                                res_type_str, 
-                                                                mem_node->base,
-                                                                mem_node->length);
-
-                                                        mem_node->next = func->mem_head;
-                                                        func->mem_head = mem_node;
-                                                }
-                                                break;
-                                        case PCI_BASE_ADDRESS_MEM_TYPE_64:
-                                                pci_bus_read_config_dword(pci_bus, devfn, cloop+4, &temp_register2);
-                                                base64 = temp_register2;
-                                                base64 = (base64 << 32) | save_base;
-
-                                                if (temp_register2) {
-                                                        dbg("sur adapter: 64 %s high dword of base64(0x%x:%x) masked to 0\n", 
-                                                                res_type_str, temp_register2, (u32)base64);
-                                                        base64 &= 0x00000000FFFFFFFFL;
-                                                }
-
-                                                if (prefetchable) {
-                                                        p_mem_node->base = base64 & PCI_BASE_ADDRESS_MEM_MASK;
-                                                        p_mem_node->length = base;
-                                                        dbg("sur adapter: 64 %s base=0x%x(len=0x%x)\n",
-                                                                res_type_str, 
-                                                                p_mem_node->base,
-                                                                p_mem_node->length);
-
-                                                        p_mem_node->next = func->p_mem_head;
-                                                        func->p_mem_head = p_mem_node;
-                                                } else {
-                                                        mem_node->base = base64 & PCI_BASE_ADDRESS_MEM_MASK;
-                                                        mem_node->length = base;
-                                                        dbg("sur adapter: 64 %s base=0x%x(len=0x%x)\n",
-                                                                res_type_str, 
-                                                                mem_node->base,
-                                                                mem_node->length);
-
-                                                        mem_node->next = func->mem_head;
-                                                        func->mem_head = mem_node;
-                                                }
-                                                cloop += 4;
-                                                break;
-                                        default:
-                                                dbg("asur: reserved BAR type=0x%x\n",
-                                                        temp_register);
-                                                break;
-                                        }
-                                } 
-                        }       /* End of base register loop */
-                } else {        /* Some other unknown header type */
-                        dbg("Save_used_res of PCI unknown type b:d=0x%x:%x. skip.\n",
-                                        func->bus, func->device);
-                }
-
-                /* find the next device in this slot */
-                if (!disable)
-                        break;
-                func = pciehp_slot_find(func->bus, func->device, index++);
-        }
-
-        return 0;
-}
-
-
-/**
- * kfree_resource_list: release memory of all list members
- * @res: resource list to free
- */
-static inline void
-return_resource_list(struct pci_resource **func, struct pci_resource **res)
-{
-        struct pci_resource *node;
-        struct pci_resource *t_node;
-
-        node = *func;
-        *func = NULL;
-        while (node) {
-                t_node = node->next;
-                return_resource(res, node);
-                node = t_node;
-        }
-}
-
-/*
- * pciehp_return_board_resources
- *
- * this routine returns all resources allocated to a board to
- * the available pool.
- *
- * returns 0 if success
- */
-int pciehp_return_board_resources(struct pci_func * func,
-                                struct resource_lists * resources)
-{
-        int rc;
-
-        dbg("%s\n", __FUNCTION__);
-
-        if (!func)
-                return 1;
-
-        return_resource_list(&(func->io_head),&(resources->io_head));
-        return_resource_list(&(func->mem_head),&(resources->mem_head));
-        return_resource_list(&(func->p_mem_head),&(resources->p_mem_head));
-        return_resource_list(&(func->bus_head),&(resources->bus_head));
-
-        rc = pciehp_resource_sort_and_combine(&(resources->mem_head));
-        rc |= pciehp_resource_sort_and_combine(&(resources->p_mem_head));
-        rc |= pciehp_resource_sort_and_combine(&(resources->io_head));
-        rc |= pciehp_resource_sort_and_combine(&(resources->bus_head));
-
-        return rc;
-}
-
-/**
- * kfree_resource_list: release memory of all list members
- * @res: resource list to free
- */
-static inline void
-kfree_resource_list(struct pci_resource **r)
-{
-        struct pci_resource *res, *tres;
-
-        res = *r;
-        *r = NULL;
-
-        while (res) {
-                tres = res;
-                res = res->next;
-                kfree(tres);
-        }
-}
-
-/**
- * pciehp_destroy_resource_list: put node back in the resource list
- * @resources: list to put nodes back
- */
-void pciehp_destroy_resource_list(struct resource_lists * resources)
-{
-        kfree_resource_list(&(resources->io_head));
-        kfree_resource_list(&(resources->mem_head));
-        kfree_resource_list(&(resources->p_mem_head));
-        kfree_resource_list(&(resources->bus_head));
-}
-
-/**
- * pciehp_destroy_board_resources: put node back in the resource list
- * @resources: list to put nodes back
- */
-void pciehp_destroy_board_resources(struct pci_func * func)
-{
-        kfree_resource_list(&(func->io_head));
-        kfree_resource_list(&(func->mem_head));
-        kfree_resource_list(&(func->p_mem_head));
-        kfree_resource_list(&(func->bus_head));
-}
diff --git a/drivers/pci/hotplug/pciehprm.h b/drivers/pci/hotplug/pciehprm.h
deleted file mode 100644
index 05f20fbc5f50..000000000000
--- a/drivers/pci/hotplug/pciehprm.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * PCIEHPRM : PCIEHP Resource Manager for ACPI/non-ACPI platform
- *
- * Copyright (C) 1995,2001 Compaq Computer Corporation
- * Copyright (C) 2001,2003 Greg Kroah-Hartman (greg@kroah.com)
- * Copyright (C) 2001 IBM Corp.
- * Copyright (C) 2003-2004 Intel Corporation
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Send feedback to <greg@kroah.com>, <kristen.c.accardi@intel.com>
- *
- */
-
-#ifndef _PCIEHPRM_H_
-#define _PCIEHPRM_H_
-
-#ifdef  CONFIG_HOTPLUG_PCI_PCIE_PHPRM_NONACPI
-#include "pciehprm_nonacpi.h"
-#endif
-
-int pciehprm_init(enum php_ctlr_type ct);
-void pciehprm_cleanup(void);
-int pciehprm_print_pirt(void);
-int pciehprm_find_available_resources(struct controller *ctrl);
-int pciehprm_set_hpp(struct controller *ctrl, struct pci_func *func, u8 card_type);
-void pciehprm_enable_card(struct controller *ctrl, struct pci_func *func, u8 card_type);
-
-#ifdef  DEBUG
-#define RES_CHECK(this, bits)   \
-        { if (((this) & (bits - 1))) \
-                printk("%s:%d ERR: potential res loss!\n", __FUNCTION__, __LINE__); }
-#else
-#define RES_CHECK(this, bits)
-#endif
-
-#endif                          /* _PCIEHPRM_H_ */
diff --git a/drivers/pci/hotplug/pciehprm_acpi.c b/drivers/pci/hotplug/pciehprm_acpi.c
index 1406db35b089..ae244e218620 100644
--- a/drivers/pci/hotplug/pciehprm_acpi.c
+++ b/drivers/pci/hotplug/pciehprm_acpi.c
@@ -24,100 +24,20 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/pci.h>
-#include <linux/init.h>
 #include <linux/acpi.h>
-#include <linux/efi.h>
 #include <linux/pci-acpi.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#ifdef  CONFIG_IA64
-#include <asm/iosapic.h>
-#endif
-#include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/actypes.h>
 #include "pciehp.h"
-#include "pciehprm.h"
-
-#define PCI_MAX_BUS             0x100
-#define ACPI_STA_DEVICE_PRESENT 0x01
 
 #define METHOD_NAME__SUN        "_SUN"
 #define METHOD_NAME__HPP        "_HPP"
 #define METHOD_NAME_OSHP        "OSHP"
 
-/* Status code for running acpi method to gain native control */
-#define NC_NOT_RUN      0
-#define OSC_NOT_EXIST   1
-#define OSC_RUN_FAILED  2
-#define OSHP_NOT_EXIST  3
-#define OSHP_RUN_FAILED 4
-#define NC_RUN_SUCCESS  5
-
-#define PHP_RES_BUS             0xA0
-#define PHP_RES_IO              0xA1
-#define PHP_RES_MEM             0xA2
-#define PHP_RES_PMEM            0xA3
-
-#define BRIDGE_TYPE_P2P         0x00
-#define BRIDGE_TYPE_HOST        0x01
-
-/* this should go to drivers/acpi/include/ */
-struct acpi__hpp {
-        u8      cache_line_size;
-        u8      latency_timer;
-        u8      enable_serr;
-        u8      enable_perr;
-};
-
-struct acpi_php_slot {
-        struct acpi_php_slot    *next;
-        struct acpi_bridge      *bridge;
-        acpi_handle     handle;
-        int     seg;
-        int     bus;
-        int     dev;
-        int     fun;
-        u32     sun;
-        struct pci_resource *mem_head;
-        struct pci_resource *p_mem_head;
-        struct pci_resource *io_head;
-        struct pci_resource *bus_head;
-        void    *slot_ops;      /* _STA, _EJx, etc */
-        struct slot *slot;
-};              /* per func */
-
-struct acpi_bridge {
-        struct acpi_bridge      *parent;
-        struct acpi_bridge      *next;
-        struct acpi_bridge      *child;
-        acpi_handle     handle;
-        int seg;
-        int pbus;                       /* pdev->bus->number            */
-        int pdevice;                    /* PCI_SLOT(pdev->devfn)        */
-        int pfunction;                  /* PCI_DEVFN(pdev->devfn)       */
-        int bus;                        /* pdev->subordinate->number    */
-        struct acpi__hpp                *_hpp;
-        struct acpi_php_slot    *slots;
-        struct pci_resource     *tmem_head;     /* total from crs       */
-        struct pci_resource     *tp_mem_head;   /* total from crs       */
-        struct pci_resource     *tio_head;      /* total from crs       */
-        struct pci_resource     *tbus_head;     /* total from crs       */
-        struct pci_resource     *mem_head;      /* available    */
-        struct pci_resource     *p_mem_head;    /* available    */
-        struct pci_resource     *io_head;       /* available    */
-        struct pci_resource     *bus_head;      /* available    */
-        int scanned;
-        int type;
-};
-
-static struct acpi_bridge *acpi_bridges_head;
-
 static u8 * acpi_path_name( acpi_handle handle)
 {
         acpi_status             status;
@@ -133,85 +53,43 @@ static u8 * acpi_path_name( acpi_handle	handle)
                 return path_name;       
 }
 
-static void acpi_get__hpp ( struct acpi_bridge  *ab);
-static int acpi_run_oshp ( struct acpi_bridge   *ab);
-static int osc_run_status = NC_NOT_RUN;
-static int oshp_run_status = NC_NOT_RUN;
-
-static int acpi_add_slot_to_php_slots(
-        struct acpi_bridge      *ab,
-        int                     bus_num,
-        acpi_handle             handle,
-        u32                     adr,
-        u32                     sun
-        )
-{
-        struct acpi_php_slot    *aps;
-        static long     samesun = -1;
-
-        aps = (struct acpi_php_slot *) kmalloc (sizeof(struct acpi_php_slot), GFP_KERNEL);
-        if (!aps) {
-                err ("acpi_pciehprm: alloc for aps fail\n");
-                return -1;
-        }
-        memset(aps, 0, sizeof(struct acpi_php_slot));
-
-        aps->handle = handle;
-        aps->bus = bus_num;
-        aps->dev = (adr >> 16) & 0xffff;
-        aps->fun = adr & 0xffff;
-        aps->sun = sun;
-
-        aps->next = ab->slots;  /* cling to the bridge */
-        aps->bridge = ab;
-        ab->slots = aps;
-
-        ab->scanned += 1;
-        if (!ab->_hpp)
-                acpi_get__hpp(ab);
-        
-        if (osc_run_status == OSC_NOT_EXIST)
-                oshp_run_status = acpi_run_oshp(ab);
-
-        if (sun != samesun) {
-                info("acpi_pciehprm:   Slot sun(%x) at s:b:d:f=0x%02x:%02x:%02x:%02x\n", 
-                        aps->sun, ab->seg, aps->bus, aps->dev, aps->fun);
-                samesun = sun;
-        }
-        return 0;
-}
-
-static void acpi_get__hpp ( struct acpi_bridge  *ab)
+static acpi_status
+acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
 {
         acpi_status             status;
         u8                      nui[4];
         struct acpi_buffer      ret_buf = { 0, NULL};
         union acpi_object       *ext_obj, *package;
-        u8                      *path_name = acpi_path_name(ab->handle);
+        u8                      *path_name = acpi_path_name(handle);
         int                     i, len = 0;
 
         /* get _hpp */
-        status = acpi_evaluate_object(ab->handle, METHOD_NAME__HPP, NULL, &ret_buf);
+        status = acpi_evaluate_object(handle, METHOD_NAME__HPP, NULL, &ret_buf);
         switch (status) {
         case AE_BUFFER_OVERFLOW:
                 ret_buf.pointer = kmalloc (ret_buf.length, GFP_KERNEL);
                 if (!ret_buf.pointer) {
-                        err ("acpi_pciehprm:%s alloc for _HPP fail\n", path_name);
-                        return;
+                        err ("%s:%s alloc for _HPP fail\n", __FUNCTION__,
+                                        path_name);
+                        return AE_NO_MEMORY;
                 }
-                status = acpi_evaluate_object(ab->handle, METHOD_NAME__HPP, NULL, &ret_buf);
+                status = acpi_evaluate_object(handle, METHOD_NAME__HPP,
+                                NULL, &ret_buf);
                 if (ACPI_SUCCESS(status))
                         break;
         default:
                 if (ACPI_FAILURE(status)) {
-                        err("acpi_pciehprm:%s _HPP fail=0x%x\n", path_name, status);
-                        return;
+                        dbg("%s:%s _HPP fail=0x%x\n", __FUNCTION__,
+                                        path_name, status);
+                        return status;
                 }
         }
 
         ext_obj = (union acpi_object *) ret_buf.pointer;
         if (ext_obj->type != ACPI_TYPE_PACKAGE) {
-                err ("acpi_pciehprm:%s _HPP obj not a package\n", path_name);
+                err ("%s:%s _HPP obj not a package\n", __FUNCTION__,
+                                path_name);
+                status = AE_ERROR;
                 goto free_and_return;
         }
 
@@ -224,1514 +102,153 @@ static void acpi_get__hpp ( struct acpi_bridge	*ab)
                         nui[i] = (u8)ext_obj->integer.value;
                         break;
                 default:
-                        err ("acpi_pciehprm:%s _HPP obj type incorrect\n", path_name);
+                        err ("%s:%s _HPP obj type incorrect\n", __FUNCTION__,
+                                        path_name);
+                        status = AE_ERROR;
                         goto free_and_return;
                 }
         }
 
-        ab->_hpp = kmalloc (sizeof (struct acpi__hpp), GFP_KERNEL);
-        if (!ab->_hpp) {
-                err ("acpi_pciehprm:%s alloc for _HPP failed\n", path_name);
-                goto free_and_return;
-        }
-        memset(ab->_hpp, 0, sizeof(struct acpi__hpp));
+        hpp->cache_line_size = nui[0];
+        hpp->latency_timer = nui[1];
+        hpp->enable_serr = nui[2];
+        hpp->enable_perr = nui[3];
 
-        ab->_hpp->cache_line_size       = nui[0];
-        ab->_hpp->latency_timer         = nui[1];
-        ab->_hpp->enable_serr           = nui[2];
-        ab->_hpp->enable_perr           = nui[3];
-
-        dbg("  _HPP: cache_line_size=0x%x\n", ab->_hpp->cache_line_size);
-        dbg("  _HPP: latency timer  =0x%x\n", ab->_hpp->latency_timer);
-        dbg("  _HPP: enable SERR    =0x%x\n", ab->_hpp->enable_serr);
-        dbg("  _HPP: enable PERR    =0x%x\n", ab->_hpp->enable_perr);
+        dbg("  _HPP: cache_line_size=0x%x\n", hpp->cache_line_size);
+        dbg("  _HPP: latency timer  =0x%x\n", hpp->latency_timer);
+        dbg("  _HPP: enable SERR    =0x%x\n", hpp->enable_serr);
+        dbg("  _HPP: enable PERR    =0x%x\n", hpp->enable_perr);
 
 free_and_return:
         kfree(ret_buf.pointer);
+        return status;
 }
 
-static int acpi_run_oshp ( struct acpi_bridge   *ab)
+static acpi_status acpi_run_oshp(acpi_handle handle)
 {
         acpi_status             status;
-        u8                      *path_name = acpi_path_name(ab->handle);
+        u8                      *path_name = acpi_path_name(handle);
 
         /* run OSHP */
-        status = acpi_evaluate_object(ab->handle, METHOD_NAME_OSHP, NULL, NULL);
+        status = acpi_evaluate_object(handle, METHOD_NAME_OSHP, NULL, NULL);
         if (ACPI_FAILURE(status)) {
-                err("acpi_pciehprm:%s OSHP fails=0x%x\n", path_name, status);
-                oshp_run_status = (status == AE_NOT_FOUND) ? OSHP_NOT_EXIST : OSHP_RUN_FAILED;
+                dbg("%s:%s OSHP fails=0x%x\n", __FUNCTION__, path_name,
+                                status);
         } else {
-                oshp_run_status = NC_RUN_SUCCESS;
-                dbg("acpi_pciehprm:%s OSHP passes =0x%x\n", path_name, status);
-                dbg("acpi_pciehprm:%s oshp_run_status =0x%x\n", path_name, oshp_run_status);
-        }
-        return oshp_run_status;
-}
-
-static acpi_status acpi_evaluate_crs(
-        acpi_handle             handle,
-        struct acpi_resource    **retbuf
-        )
-{
-        acpi_status             status;
-        struct acpi_buffer      crsbuf;
-        u8                      *path_name = acpi_path_name(handle);
-
-        crsbuf.length  = 0;
-        crsbuf.pointer = NULL;
-
-        status = acpi_get_current_resources (handle, &crsbuf);
-
-        switch (status) {
-        case AE_BUFFER_OVERFLOW:
-                break;          /* found */
-        case AE_NOT_FOUND:
-                dbg("acpi_pciehprm:%s _CRS not found\n", path_name);
-                return status;
-        default:
-                err ("acpi_pciehprm:%s _CRS fail=0x%x\n", path_name, status);
-                return status;
+                dbg("%s:%s OSHP passes\n", __FUNCTION__, path_name);
         }
-
-        crsbuf.pointer = kmalloc (crsbuf.length, GFP_KERNEL);
-        if (!crsbuf.pointer) {
-                err ("acpi_pciehprm: alloc %ld bytes for %s _CRS fail\n", (ulong)crsbuf.length, path_name);
-                return AE_NO_MEMORY;
-        }
-
-        status = acpi_get_current_resources (handle, &crsbuf);
-        if (ACPI_FAILURE(status)) {
-                err("acpi_pciehprm: %s _CRS fail=0x%x.\n", path_name, status);
-                kfree(crsbuf.pointer);
-                return status;
-        }
-
-        *retbuf = crsbuf.pointer;
-
         return status;
 }
 
-static void free_pci_resource ( struct pci_resource     *aprh)
+static int is_root_bridge(acpi_handle handle)
 {
-        struct pci_resource     *res, *next;
+        acpi_status status;
+        struct acpi_device_info *info;
+        struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+        int i;
 
-        for (res = aprh; res; res = next) {
-                next = res->next;
-                kfree(res);
-        }
-}
-
-static void print_pci_resource ( struct pci_resource    *aprh)
-{
-        struct pci_resource     *res;
-
-        for (res = aprh; res; res = res->next)
-                dbg("        base= 0x%x length= 0x%x\n", res->base, res->length);
-}
-
-static void print_slot_resources( struct acpi_php_slot  *aps)
-{
-        if (aps->bus_head) {
-                dbg("    BUS Resources:\n");
-                print_pci_resource (aps->bus_head);
-        }
-
-        if (aps->io_head) {
-                dbg("    IO Resources:\n");
-                print_pci_resource (aps->io_head);
-        }
-
-        if (aps->mem_head) {
-                dbg("    MEM Resources:\n");
-                print_pci_resource (aps->mem_head);
-        }
-
-        if (aps->p_mem_head) {
-                dbg("    PMEM Resources:\n");
-                print_pci_resource (aps->p_mem_head);
-        }
-}
-
-static void print_pci_resources( struct acpi_bridge     *ab)
-{
-        if (ab->tbus_head) {
-                dbg("    Total BUS Resources:\n");
-                print_pci_resource (ab->tbus_head);
-        }
-        if (ab->bus_head) {
-                dbg("    BUS Resources:\n");
-                print_pci_resource (ab->bus_head);
-        }
-
-        if (ab->tio_head) {
-                dbg("    Total IO Resources:\n");
-                print_pci_resource (ab->tio_head);
-        }
-        if (ab->io_head) {
-                dbg("    IO Resources:\n");
-                print_pci_resource (ab->io_head);
-        }
-
-        if (ab->tmem_head) {
-                dbg("    Total MEM Resources:\n");
-                print_pci_resource (ab->tmem_head);
-        }
-        if (ab->mem_head) {
-                dbg("    MEM Resources:\n");
-                print_pci_resource (ab->mem_head);
-        }
-
-        if (ab->tp_mem_head) {
-                dbg("    Total PMEM Resources:\n");
-                print_pci_resource (ab->tp_mem_head);
-        }
-        if (ab->p_mem_head) {
-                dbg("    PMEM Resources:\n");
-                print_pci_resource (ab->p_mem_head);
-        }
-        if (ab->_hpp) {
-                dbg("    _HPP: cache_line_size=0x%x\n", ab->_hpp->cache_line_size);
-                dbg("    _HPP: latency timer  =0x%x\n", ab->_hpp->latency_timer);
-                dbg("    _HPP: enable SERR    =0x%x\n", ab->_hpp->enable_serr);
-                dbg("    _HPP: enable PERR    =0x%x\n", ab->_hpp->enable_perr);
-        }
-}
-
-static int pciehprm_delete_resource(
-        struct pci_resource **aprh,
-        ulong base,
-        ulong size)
-{
-        struct pci_resource *res;
-        struct pci_resource *prevnode;
-        struct pci_resource *split_node;
-        ulong tbase;
-
-        pciehp_resource_sort_and_combine(aprh);
-
-        for (res = *aprh; res; res = res->next) {
-                if (res->base > base)
-                        continue;
-
-                if ((res->base + res->length) < (base + size))
-                        continue;
-
-                if (res->base < base) {
-                        tbase = base;
-
-                        if ((res->length - (tbase - res->base)) < size)
-                                continue;
-
-                        split_node = (struct pci_resource *) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-                        if (!split_node)
-                                return -ENOMEM;
-
-                        split_node->base = res->base;
-                        split_node->length = tbase - res->base;
-                        res->base = tbase;
-                        res->length -= split_node->length;
-
-                        split_node->next = res->next;
-                        res->next = split_node;
-                }
-
-                if (res->length >= size) {
-                        split_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-                        if (!split_node)
-                                return -ENOMEM;
-
-                        split_node->base = res->base + size;
-                        split_node->length = res->length - size;
-                        res->length = size;
-
-                        split_node->next = res->next;
-                        res->next = split_node;
-                }
-
-                if (*aprh == res) {
-                        *aprh = res->next;
-                } else {
-                        prevnode = *aprh;
-                        while (prevnode->next != res)
-                                prevnode = prevnode->next;
-
-                        prevnode->next = res->next;
-                }
-                res->next = NULL;
-                kfree(res);
-                break;
-        }
-
-        return 0;
-}
-
-static int pciehprm_delete_resources(
-        struct pci_resource **aprh,
-        struct pci_resource *this
-        )
-{
-        struct pci_resource *res;
-
-        for (res = this; res; res = res->next)
-                pciehprm_delete_resource(aprh, res->base, res->length);
-
-        return 0;
-}
-
-static int pciehprm_add_resource(
-        struct pci_resource **aprh,
-        ulong base,
-        ulong size)
-{
-        struct pci_resource *res;
-
-        for (res = *aprh; res; res = res->next) {
-                if ((res->base + res->length) == base) {
-                        res->length += size;
-                        size = 0L;
-                        break;
+        status = acpi_get_object_info(handle, &buffer);
+        if (ACPI_SUCCESS(status)) {
+                info = buffer.pointer;
+                if ((info->valid & ACPI_VALID_HID) &&
+                        !strcmp(PCI_ROOT_HID_STRING,
+                                        info->hardware_id.value)) {
+                        acpi_os_free(buffer.pointer);
+                        return 1;
+                }
+                if (info->valid & ACPI_VALID_CID) {
+                        for (i=0; i < info->compatibility_id.count; i++) {
+                                if (!strcmp(PCI_ROOT_HID_STRING,
+                                        info->compatibility_id.id[i].value)) {
+                                        acpi_os_free(buffer.pointer);
+                                        return 1;
+                                }
+                        }
                 }
-                if (res->next == *aprh)
-                        break;
         }
-
-        if (size) {
-                res = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-                if (!res) {
-                        err ("acpi_pciehprm: alloc for res fail\n");
-                        return -ENOMEM;
-                }
-                memset(res, 0, sizeof (struct pci_resource));
-
-                res->base = base;
-                res->length = size;
-                res->next = *aprh;
-                *aprh = res;
-        }
-
         return 0;
 }
 
-static int pciehprm_add_resources(
-        struct pci_resource **aprh,
-        struct pci_resource *this
-        )
-{
-        struct pci_resource *res;
-        int     rc = 0;
-
-        for (res = this; res && !rc; res = res->next)
-                rc = pciehprm_add_resource(aprh, res->base, res->length);
-
-        return rc;
-}
-
-static void acpi_parse_io (
-        struct acpi_bridge              *ab,
-        union acpi_resource_data        *data
-        )
+int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
 {
-        struct acpi_resource_io *dataio;
-        dataio = (struct acpi_resource_io *) data;
-
-        dbg("Io Resource\n");
-        dbg("  %d bit decode\n", ACPI_DECODE_16 == dataio->io_decode ? 16:10);
-        dbg("  Range minimum base: %08X\n", dataio->min_base_address);
-        dbg("  Range maximum base: %08X\n", dataio->max_base_address);
-        dbg("  Alignment: %08X\n", dataio->alignment);
-        dbg("  Range Length: %08X\n", dataio->range_length);
-}
-
-static void acpi_parse_fixed_io (
-        struct acpi_bridge      *ab,
-        union acpi_resource_data        *data
-        )
-{
-        struct acpi_resource_fixed_io  *datafio;
-        datafio = (struct acpi_resource_fixed_io *) data;
-
-        dbg("Fixed Io Resource\n");
-        dbg("  Range base address: %08X", datafio->base_address);
-        dbg("  Range length: %08X", datafio->range_length);
-}
-
-static void acpi_parse_address16_32 (
-        struct acpi_bridge      *ab,
-        union acpi_resource_data        *data,
-        acpi_resource_type      id
-        )
-{
-        /* 
-         * acpi_resource_address16 == acpi_resource_address32
-         * acpi_resource_address16 *data16 = (acpi_resource_address16 *) data;
+        acpi_status status;
+        acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev));
+        struct pci_dev *pdev = dev;
+        u8 *path_name;
+        /*
+         * Per PCI firmware specification, we should run the ACPI _OSC
+         * method to get control of hotplug hardware before using it.
+         * If an _OSC is missing, we look for an OSHP to do the same thing.
+         * To handle different BIOS behavior, we look for _OSC and OSHP
+         * within the scope of the hotplug controller and its parents, upto
+         * the host bridge under which this controller exists.
          */
-        struct acpi_resource_address32 *data32 = (struct acpi_resource_address32 *) data;
-        struct pci_resource **aprh, **tprh;
-
-        if (id == ACPI_RSTYPE_ADDRESS16)
-                dbg("acpi_pciehprm:16-Bit Address Space Resource\n");
-        else
-                dbg("acpi_pciehprm:32-Bit Address Space Resource\n");
-
-        switch (data32->resource_type) {
-        case ACPI_MEMORY_RANGE: 
-                dbg("  Resource Type: Memory Range\n");
-                aprh = &ab->mem_head;
-                tprh = &ab->tmem_head;
-
-                switch (data32->attribute.memory.cache_attribute) {
-                case ACPI_NON_CACHEABLE_MEMORY:
-                        dbg("  Type Specific: Noncacheable memory\n");
-                        break; 
-                case ACPI_CACHABLE_MEMORY:
-                        dbg("  Type Specific: Cacheable memory\n");
-                        break; 
-                case ACPI_WRITE_COMBINING_MEMORY:
-                        dbg("  Type Specific: Write-combining memory\n");
-                        break; 
-                case ACPI_PREFETCHABLE_MEMORY:
-                        aprh = &ab->p_mem_head;
-                        dbg("  Type Specific: Prefetchable memory\n");
-                        break; 
-                default:
-                        dbg("  Type Specific: Invalid cache attribute\n");
+        while (!handle) {
+                /*
+                 * This hotplug controller was not listed in the ACPI name
+                 * space at all. Try to get acpi handle of parent pci bus.
+                 */
+                if (!pdev || !pdev->bus->parent)
                         break;
-                }
-
-                dbg("  Type Specific: Read%s\n", ACPI_READ_WRITE_MEMORY == data32->attribute.memory.read_write_attribute ? "/Write":" Only");
-                break;
-
-        case ACPI_IO_RANGE: 
-                dbg("  Resource Type: I/O Range\n");
-                aprh = &ab->io_head;
-                tprh = &ab->tio_head;
-
-                switch (data32->attribute.io.range_attribute) {
-                case ACPI_NON_ISA_ONLY_RANGES:
-                        dbg("  Type Specific: Non-ISA Io Addresses\n");
-                        break; 
-                case ACPI_ISA_ONLY_RANGES:
-                        dbg("  Type Specific: ISA Io Addresses\n");
-                        break; 
-                case ACPI_ENTIRE_RANGE:
-                        dbg("  Type Specific: ISA and non-ISA Io Addresses\n");
-                        break; 
-                default:
-                        dbg("  Type Specific: Invalid range attribute\n");
+                dbg("Could not find %s in acpi namespace, trying parent\n",
+                                pci_name(pdev));
+                if (!pdev->bus->parent->self)
+                        /* Parent must be a host bridge */
+                        handle = acpi_get_pci_rootbridge_handle(
+                                        pci_domain_nr(pdev->bus->parent),
+                                        pdev->bus->parent->number);
+                else
+                        handle = DEVICE_ACPI_HANDLE(
+                                        &(pdev->bus->parent->self->dev));
+                pdev = pdev->bus->parent->self;
+        }
+
+        while (handle) {
+                path_name = acpi_path_name(handle);
+                dbg("Trying to get hotplug control for %s \n", path_name);
+                status = pci_osc_control_set(handle,
+                                OSC_PCI_EXPRESS_NATIVE_HP_CONTROL);
+                if (status == AE_NOT_FOUND)
+                        status = acpi_run_oshp(handle);
+                if (ACPI_SUCCESS(status)) {
+                        dbg("Gained control for hotplug HW for pci %s (%s)\n",
+                                pci_name(dev), path_name);
+                        return 0;
+                }
+                if (is_root_bridge(handle))
                         break;
-                }
-                break;
-
-        case ACPI_BUS_NUMBER_RANGE: 
-                dbg("  Resource Type: Bus Number Range(fixed)\n");
-                /* fixup to be compatible with the rest of php driver */
-                data32->min_address_range++;
-                data32->address_length--;
-                aprh = &ab->bus_head;
-                tprh = &ab->tbus_head;
-                break; 
-        default: 
-                dbg("  Resource Type: Invalid resource type. Exiting.\n");
-                return;
-        }
-
-        dbg("  Resource %s\n", ACPI_CONSUMER == data32->producer_consumer ? "Consumer":"Producer");
-        dbg("  %s decode\n", ACPI_SUB_DECODE == data32->decode ? "Subtractive":"Positive");
-        dbg("  Min address is %s fixed\n", ACPI_ADDRESS_FIXED == data32->min_address_fixed ? "":"not");
-        dbg("  Max address is %s fixed\n", ACPI_ADDRESS_FIXED == data32->max_address_fixed ? "":"not");
-        dbg("  Granularity: %08X\n", data32->granularity);
-        dbg("  Address range min: %08X\n", data32->min_address_range);
-        dbg("  Address range max: %08X\n", data32->max_address_range);
-        dbg("  Address translation offset: %08X\n", data32->address_translation_offset);
-        dbg("  Address Length: %08X\n", data32->address_length);
-
-        if (0xFF != data32->resource_source.index) {
-                dbg("  Resource Source Index: %X\n", data32->resource_source.index);
-                /* dbg("  Resource Source: %s\n", data32->resource_source.string_ptr); */
-        }
-
-        pciehprm_add_resource(aprh, data32->min_address_range, data32->address_length);
-}
-
-static acpi_status acpi_parse_crs(
-        struct acpi_bridge      *ab,
-        struct acpi_resource    *crsbuf
-        )
-{
-        acpi_status             status = AE_OK;
-        struct acpi_resource    *resource = crsbuf;
-        u8                              count = 0;
-        u8                              done = 0;
-
-        while (!done) {
-                dbg("acpi_pciehprm: PCI bus 0x%x Resource structure %x.\n", ab->bus, count++);
-                switch (resource->id) {
-                case ACPI_RSTYPE_IRQ:
-                        dbg("Irq -------- Resource\n");
-                        break; 
-                case ACPI_RSTYPE_DMA:
-                        dbg("DMA -------- Resource\n");
-                        break; 
-                case ACPI_RSTYPE_START_DPF:
-                        dbg("Start DPF -------- Resource\n");
-                        break; 
-                case ACPI_RSTYPE_END_DPF:
-                        dbg("End DPF -------- Resource\n");
-                        break; 
-                case ACPI_RSTYPE_IO:
-                        acpi_parse_io (ab, &resource->data);
-                        break; 
-                case ACPI_RSTYPE_FIXED_IO:
-                        acpi_parse_fixed_io (ab, &resource->data);
-                        break; 
-                case ACPI_RSTYPE_VENDOR:
-                        dbg("Vendor -------- Resource\n");
-                        break; 
-                case ACPI_RSTYPE_END_TAG:
-                        dbg("End_tag -------- Resource\n");
-                        done = 1;
-                        break; 
-                case ACPI_RSTYPE_MEM24:
-                        dbg("Mem24 -------- Resource\n");
-                        break; 
-                case ACPI_RSTYPE_MEM32:
-                        dbg("Mem32 -------- Resource\n");
-                        break; 
-                case ACPI_RSTYPE_FIXED_MEM32:
-                        dbg("Fixed Mem32 -------- Resource\n");
-                        break; 
-                case ACPI_RSTYPE_ADDRESS16:
-                        acpi_parse_address16_32(ab, &resource->data, ACPI_RSTYPE_ADDRESS16);
-                        break; 
-                case ACPI_RSTYPE_ADDRESS32:
-                        acpi_parse_address16_32(ab, &resource->data, ACPI_RSTYPE_ADDRESS32);
-                        break; 
-                case ACPI_RSTYPE_ADDRESS64:
-                        info("Address64 -------- Resource unparsed\n");
-                        break; 
-                case ACPI_RSTYPE_EXT_IRQ:
-                        dbg("Ext Irq -------- Resource\n");
-                        break; 
-                default:
-                        dbg("Invalid -------- resource type 0x%x\n", resource->id);
-                        break;
-                }
-
-                resource = (struct acpi_resource *) ((char *)resource + resource->length);
-        }
-
-        return status;
-}
-
-static acpi_status acpi_get_crs( struct acpi_bridge     *ab)
-{
-        acpi_status             status;
-        struct acpi_resource    *crsbuf;
-
-        status = acpi_evaluate_crs(ab->handle, &crsbuf);
-        if (ACPI_SUCCESS(status)) {
-                status = acpi_parse_crs(ab, crsbuf);
-                kfree(crsbuf);
-
-                pciehp_resource_sort_and_combine(&ab->bus_head);
-                pciehp_resource_sort_and_combine(&ab->io_head);
-                pciehp_resource_sort_and_combine(&ab->mem_head);
-                pciehp_resource_sort_and_combine(&ab->p_mem_head);
-
-                pciehprm_add_resources (&ab->tbus_head, ab->bus_head);
-                pciehprm_add_resources (&ab->tio_head, ab->io_head);
-                pciehprm_add_resources (&ab->tmem_head, ab->mem_head);
-                pciehprm_add_resources (&ab->tp_mem_head, ab->p_mem_head);
-        }
-
-        return status;
-}
-
-/* find acpi_bridge downword from ab.  */
-static struct acpi_bridge *
-find_acpi_bridge_by_bus(
-        struct acpi_bridge *ab,
-        int seg,
-        int bus         /* pdev->subordinate->number */
-        )
-{
-        struct acpi_bridge      *lab = NULL;
-
-        if (!ab)
-                return NULL;
-
-        if ((ab->bus == bus) && (ab->seg == seg))
-                return ab;
-
-        if (ab->child)
-                lab = find_acpi_bridge_by_bus(ab->child, seg, bus);
-
-        if (!lab)
-        if (ab->next)
-                lab = find_acpi_bridge_by_bus(ab->next, seg, bus);
-
-        return lab;
-}
-
-/*
- * Build a device tree of ACPI PCI Bridges
- */
-static void pciehprm_acpi_register_a_bridge (
-        struct acpi_bridge      **head,
-        struct acpi_bridge      *pab,   /* parent bridge to which child bridge is added */
-        struct acpi_bridge      *cab    /* child bridge to add */
-        )
-{
-        struct acpi_bridge      *lpab;
-        struct acpi_bridge      *lcab;
-
-        lpab = find_acpi_bridge_by_bus(*head, pab->seg, pab->bus);
-        if (!lpab) {
-                if (!(pab->type & BRIDGE_TYPE_HOST))
-                        warn("PCI parent bridge s:b(%x:%x) not in list.\n", pab->seg, pab->bus);
-                pab->next = *head;
-                *head = pab;
-                lpab = pab;
-        }
-
-        if ((cab->type & BRIDGE_TYPE_HOST) && (pab == cab))
-                return;
-
-        lcab = find_acpi_bridge_by_bus(*head, cab->seg, cab->bus);
-        if (lcab) {
-                if ((pab->bus != lcab->parent->bus) || (lcab->bus != cab->bus))
-                        err("PCI child bridge s:b(%x:%x) in list with diff parent.\n", cab->seg, cab->bus);
-                return;
-        } else
-                lcab = cab;
-
-        lcab->parent = lpab;
-        lcab->next = lpab->child;
-        lpab->child = lcab;
-}
-
-static acpi_status pciehprm_acpi_build_php_slots_callback(
-        acpi_handle             handle,
-        u32                     Level,
-        void                    *context,
-        void                    **retval
-        )
-{
-        ulong           bus_num;
-        ulong           seg_num;
-        ulong           sun, adr;
-        ulong           padr = 0;
-        acpi_handle             phandle = NULL;
-        struct acpi_bridge      *pab = (struct acpi_bridge *)context;
-        struct acpi_bridge      *lab;
-        acpi_status             status;
-        u8                      *path_name = acpi_path_name(handle);
-
-        /* get _SUN */
-        status = acpi_evaluate_integer(handle, METHOD_NAME__SUN, NULL, &sun);
-        switch(status) {
-        case AE_NOT_FOUND:
-                return AE_OK;
-        default:
-                if (ACPI_FAILURE(status)) {
-                        err("acpi_pciehprm:%s _SUN fail=0x%x\n", path_name, status);
-                        return status;
-                }
-        }
-
-        /* get _ADR. _ADR must exist if _SUN exists */
-        status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL, &adr);
-        if (ACPI_FAILURE(status)) {
-                err("acpi_pciehprm:%s _ADR fail=0x%x\n", path_name, status);
-                return status;
-        }
-
-        dbg("acpi_pciehprm:%s sun=0x%08x adr=0x%08x\n", path_name, (u32)sun, (u32)adr);
-
-        status = acpi_get_parent(handle, &phandle);
-        if (ACPI_FAILURE(status)) {
-                err("acpi_pciehprm:%s get_parent fail=0x%x\n", path_name, status);
-                return (status);
-        }
-
-        bus_num = pab->bus;
-        seg_num = pab->seg;
-
-        if (pab->bus == bus_num) {
-                lab = pab;
-        } else {
-                dbg("WARN: pab is not parent\n");
-                lab = find_acpi_bridge_by_bus(pab, seg_num, bus_num);
-                if (!lab) {
-                        dbg("acpi_pciehprm: alloc new P2P bridge(%x) for sun(%08x)\n", (u32)bus_num, (u32)sun);
-                        lab = (struct acpi_bridge *)kmalloc(sizeof(struct acpi_bridge), GFP_KERNEL);
-                        if (!lab) {
-                                err("acpi_pciehprm: alloc for ab fail\n");
-                                return AE_NO_MEMORY;
-                        }
-                        memset(lab, 0, sizeof(struct acpi_bridge));
-
-                        lab->handle = phandle;
-                        lab->pbus = pab->bus;
-                        lab->pdevice = (int)(padr >> 16) & 0xffff;
-                        lab->pfunction = (int)(padr & 0xffff);
-                        lab->bus = (int)bus_num;
-                        lab->scanned = 0;
-                        lab->type = BRIDGE_TYPE_P2P;
-
-                        pciehprm_acpi_register_a_bridge (&acpi_bridges_head, pab, lab);
-                } else
-                        dbg("acpi_pciehprm: found P2P bridge(%x) for sun(%08x)\n", (u32)bus_num, (u32)sun);
-        }
-
-        acpi_add_slot_to_php_slots(lab, (int)bus_num, handle, (u32)adr, (u32)sun);
-
-        return (status);
-}
-
-static int pciehprm_acpi_build_php_slots(
-        struct acpi_bridge      *ab,
-        u32                     depth
-        )
-{
-        acpi_status     status;
-        u8              *path_name = acpi_path_name(ab->handle);
-
-        /* Walk down this pci bridge to get _SUNs if any behind P2P */
-        status = acpi_walk_namespace ( ACPI_TYPE_DEVICE,
-                                ab->handle,
-                                depth,
-                                pciehprm_acpi_build_php_slots_callback,
-                                ab,
-                                NULL );
-        if (ACPI_FAILURE(status)) {
-                dbg("acpi_pciehprm:%s walk for _SUN on pci bridge seg:bus(%x:%x) fail=0x%x\n", path_name, ab->seg, ab->bus, status);
-                return -1;
-        }
-
-        return 0;
-}
-
-static void build_a_bridge(
-        struct acpi_bridge      *pab,
-        struct acpi_bridge      *ab
-        )
-{
-        u8              *path_name = acpi_path_name(ab->handle);
-
-        pciehprm_acpi_register_a_bridge (&acpi_bridges_head, pab, ab);
-
-        switch (ab->type) {
-        case BRIDGE_TYPE_HOST:
-                dbg("acpi_pciehprm: Registered PCI HOST Bridge(%02x)    on s:b:d:f(%02x:%02x:%02x:%02x) [%s]\n",
-                        ab->bus, ab->seg, ab->pbus, ab->pdevice, ab->pfunction, path_name);
-                break;
-        case BRIDGE_TYPE_P2P:
-                dbg("acpi_pciehprm: Registered PCI  P2P Bridge(%02x-%02x) on s:b:d:f(%02x:%02x:%02x:%02x) [%s]\n",
-                        ab->pbus, ab->bus, ab->seg, ab->pbus, ab->pdevice, ab->pfunction, path_name);
-                break;
-        };
-
-        /* build any immediate PHP slots under this pci bridge */
-        pciehprm_acpi_build_php_slots(ab, 1);
-}
-
-static struct acpi_bridge * add_p2p_bridge(
-        acpi_handle handle,
-        struct acpi_bridge      *pab,   /* parent */
-        ulong   adr
-        )
-{
-        struct acpi_bridge      *ab;
-        struct pci_dev  *pdev;
-        ulong           devnum, funcnum;
-        u8                      *path_name = acpi_path_name(handle);
-
-        ab = (struct acpi_bridge *) kmalloc (sizeof(struct acpi_bridge), GFP_KERNEL);
-        if (!ab) {
-                err("acpi_pciehprm: alloc for ab fail\n");
-                return NULL;
-        }
-        memset(ab, 0, sizeof(struct acpi_bridge));
-
-        devnum = (adr >> 16) & 0xffff;
-        funcnum = adr & 0xffff;
-
-        pdev = pci_find_slot(pab->bus, PCI_DEVFN(devnum, funcnum));
-        if (!pdev || !pdev->subordinate) {
-                err("acpi_pciehprm:%s is not a P2P Bridge\n", path_name);
-                kfree(ab);
-                return NULL;
-        }
-
-        ab->handle = handle;
-        ab->seg = pab->seg;
-        ab->pbus = pab->bus;            /* or pdev->bus->number */
-        ab->pdevice = devnum;           /* or PCI_SLOT(pdev->devfn) */
-        ab->pfunction = funcnum;        /* or PCI_FUNC(pdev->devfn) */
-        ab->bus = pdev->subordinate->number;
-        ab->scanned = 0;
-        ab->type = BRIDGE_TYPE_P2P;
-
-        dbg("acpi_pciehprm: P2P(%x-%x) on pci=b:d:f(%x:%x:%x) acpi=b:d:f(%x:%x:%x) [%s]\n",
-                pab->bus, ab->bus, pdev->bus->number, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
-                pab->bus, (u32)devnum, (u32)funcnum, path_name);
-
-        build_a_bridge(pab, ab);
-
-        return ab;
-}
-
-static acpi_status scan_p2p_bridge(
-        acpi_handle             handle,
-        u32                     Level,
-        void                    *context,
-        void                    **retval
-        )
-{
-        struct acpi_bridge      *pab = (struct acpi_bridge *)context;
-        struct acpi_bridge      *ab;
-        acpi_status             status;
-        ulong                   adr = 0;
-        u8                      *path_name = acpi_path_name(handle);
-        ulong                   devnum, funcnum;
-        struct pci_dev          *pdev;
-
-        /* get device, function */
-        status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL, &adr);
-        if (ACPI_FAILURE(status)) {
-                if (status != AE_NOT_FOUND)
-                        err("acpi_pciehprm:%s _ADR fail=0x%x\n", path_name, status);
-                return AE_OK;
-        }
-
-        devnum = (adr >> 16) & 0xffff;
-        funcnum = adr & 0xffff;
-
-        pdev = pci_find_slot(pab->bus, PCI_DEVFN(devnum, funcnum));
-        if (!pdev)
-                return AE_OK;
-        if (!pdev->subordinate)
-                return AE_OK;
-
-        ab = add_p2p_bridge(handle, pab, adr);
-        if (ab) {
-                status = acpi_walk_namespace ( ACPI_TYPE_DEVICE,
-                                        handle,
-                                        (u32)1,
-                                        scan_p2p_bridge,
-                                        ab,
-                                        NULL);
+                chandle = handle;
+                status = acpi_get_parent(chandle, &handle);
                 if (ACPI_FAILURE(status))
-                        dbg("acpi_pciehprm:%s find_p2p fail=0x%x\n", path_name, status);
-        }
-
-        return AE_OK;
-}
-
-static struct acpi_bridge * add_host_bridge(
-        acpi_handle handle,
-        ulong   segnum,
-        ulong   busnum
-        )
-{
-        ulong                   adr = 0;
-        acpi_status             status;
-        struct acpi_bridge      *ab;
-        u8                      *path_name = acpi_path_name(handle);
-
-        /* get device, function: host br adr is always 0000 though.  */
-        status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL, &adr);
-        if (ACPI_FAILURE(status)) {
-                err("acpi_pciehprm:%s _ADR fail=0x%x\n", path_name, status);
-                return NULL;
-        }
-        dbg("acpi_pciehprm: ROOT PCI seg(0x%x)bus(0x%x)dev(0x%x)func(0x%x) [%s]\n", (u32)segnum, 
-                (u32)busnum, (u32)(adr >> 16) & 0xffff, (u32)adr & 0xffff, path_name);
-
-        ab = (struct acpi_bridge *) kmalloc (sizeof(struct acpi_bridge), GFP_KERNEL);
-        if (!ab) {
-                err("acpi_pciehprm: alloc for ab fail\n");
-                return NULL;
-        }
-        memset(ab, 0, sizeof(struct acpi_bridge));
-
-        ab->handle = handle;
-        ab->seg = (int)segnum;
-        ab->bus = ab->pbus = (int)busnum;
-        ab->pdevice = (int)(adr >> 16) & 0xffff;
-        ab->pfunction = (int)(adr & 0xffff);
-        ab->scanned = 0;
-        ab->type = BRIDGE_TYPE_HOST;
-
-        /* get root pci bridge's current resources */
-        status = acpi_get_crs(ab);
-        if (ACPI_FAILURE(status)) {
-                err("acpi_pciehprm:%s evaluate _CRS fail=0x%x\n", path_name, status);
-                kfree(ab);
-                return NULL;
-        }
-
-        status = pci_osc_control_set (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL); 
-        if (ACPI_FAILURE(status)) {
-                err("%s: status %x\n", __FUNCTION__, status);
-                osc_run_status = (status == AE_NOT_FOUND) ? OSC_NOT_EXIST : OSC_RUN_FAILED;
-        } else {
-                osc_run_status = NC_RUN_SUCCESS;
-        }       
-        dbg("%s: osc_run_status %x\n", __FUNCTION__, osc_run_status);
-        
-        build_a_bridge(ab, ab);
-
-        return ab;
-}
-
-static acpi_status acpi_scan_from_root_pci_callback (
-        acpi_handle     handle,
-        u32                     Level,
-        void            *context,
-        void            **retval
-        )
-{
-        ulong           segnum = 0;
-        ulong           busnum = 0;
-        acpi_status             status;
-        struct acpi_bridge      *ab;
-        u8                      *path_name = acpi_path_name(handle);
-
-        /* get bus number of this pci root bridge */
-        status = acpi_evaluate_integer(handle, METHOD_NAME__SEG, NULL, &segnum);
-        if (ACPI_FAILURE(status)) {
-                if (status != AE_NOT_FOUND) {
-                        err("acpi_pciehprm:%s evaluate _SEG fail=0x%x\n", path_name, status);
-                        return status;
-                }
-                segnum = 0;
-        }
-
-        /* get bus number of this pci root bridge */
-        status = acpi_evaluate_integer(handle, METHOD_NAME__BBN, NULL, &busnum);
-        if (ACPI_FAILURE(status)) {
-                err("acpi_pciehprm:%s evaluate _BBN fail=0x%x\n", path_name, status);
-                return (status);
-        }
-
-        ab = add_host_bridge(handle, segnum, busnum);
-        if (ab) {
-                status = acpi_walk_namespace ( ACPI_TYPE_DEVICE,
-                                        handle,
-                                        1,
-                                        scan_p2p_bridge,
-                                        ab,
-                                        NULL);
-                if (ACPI_FAILURE(status))
-                        dbg("acpi_pciehprm:%s find_p2p fail=0x%x\n", path_name, status);
+                        break;
         }
 
-        return AE_OK;
+        err("Cannot get control of hotplug hardware for pci %s\n",
+                        pci_name(dev));
+        return -1;
 }
 
-static int pciehprm_acpi_scan_pci (void)
+void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
+                struct hotplug_params *hpp)
 {
-        acpi_status     status;
+        acpi_status status = AE_NOT_FOUND;
+        struct pci_dev *pdev = dev;
 
         /*
-         * TBD: traverse LDM device tree with the help of
-         *  unified ACPI augmented for php device population.
+         * _HPP settings apply to all child buses, until another _HPP is
+         * encountered. If we don't find an _HPP for the input pci dev,
+         * look for it in the parent device scope since that would apply to
+         * this pci dev. If we don't find any _HPP, use hardcoded defaults
          */
-        status = acpi_get_devices ( PCI_ROOT_HID_STRING,
-                                acpi_scan_from_root_pci_callback,
-                                NULL,
-                                NULL );
-        if (ACPI_FAILURE(status)) {
-                err("acpi_pciehprm:get_device PCI ROOT HID fail=0x%x\n", status);
-                return -1;
-        }
-
-        return 0;
-}
-
-int pciehprm_init(enum php_ctlr_type ctlr_type)
-{
-        int     rc;
-
-        if (ctlr_type != PCI)
-                return -ENODEV;
-
-        dbg("pciehprm ACPI init <enter>\n");
-        acpi_bridges_head = NULL;
-
-        /* construct PCI bus:device tree of acpi_handles */
-        rc = pciehprm_acpi_scan_pci();
-        if (rc)
-                return rc;
-
-        if ((oshp_run_status != NC_RUN_SUCCESS) && (osc_run_status != NC_RUN_SUCCESS)) {
-                err("Fails to gain control of native hot-plug\n");
-                rc = -ENODEV;
-        }
-
-        dbg("pciehprm ACPI init %s\n", (rc)?"fail":"success");
-        return rc;
-}
-
-static void free_a_slot(struct acpi_php_slot *aps)
-{
-        dbg("        free a php func of slot(0x%02x) on PCI b:d:f=0x%02x:%02x:%02x\n", aps->sun, aps->bus, aps->dev, aps->fun);
-
-        free_pci_resource (aps->io_head);
-        free_pci_resource (aps->bus_head);
-        free_pci_resource (aps->mem_head);
-        free_pci_resource (aps->p_mem_head);
-
-        kfree(aps);
-}
-
-static void free_a_bridge( struct acpi_bridge   *ab)
-{
-        struct acpi_php_slot    *aps, *next;
-
-        switch (ab->type) {
-        case BRIDGE_TYPE_HOST:
-                dbg("Free ACPI PCI HOST Bridge(%x) [%s] on s:b:d:f(%x:%x:%x:%x)\n",
-                        ab->bus, acpi_path_name(ab->handle), ab->seg, ab->pbus, ab->pdevice, ab->pfunction);
-                break;
-        case BRIDGE_TYPE_P2P:
-                dbg("Free ACPI PCI P2P Bridge(%x-%x) [%s] on s:b:d:f(%x:%x:%x:%x)\n",
-                        ab->pbus, ab->bus, acpi_path_name(ab->handle), ab->seg, ab->pbus, ab->pdevice, ab->pfunction);
-                break;
-        };
-
-        /* free slots first */
-        for (aps = ab->slots; aps; aps = next) {
-                next = aps->next;
-                free_a_slot(aps);
-        }
-
-        free_pci_resource (ab->io_head);
-        free_pci_resource (ab->tio_head);
-        free_pci_resource (ab->bus_head);
-        free_pci_resource (ab->tbus_head);
-        free_pci_resource (ab->mem_head);
-        free_pci_resource (ab->tmem_head);
-        free_pci_resource (ab->p_mem_head);
-        free_pci_resource (ab->tp_mem_head);
-
-        kfree(ab);
-}
-
-static void pciehprm_free_bridges ( struct acpi_bridge  *ab)
-{
-        if (!ab)
-                return;
-
-        if (ab->child)
-                pciehprm_free_bridges (ab->child);
-
-        if (ab->next)
-                pciehprm_free_bridges (ab->next);
-
-        free_a_bridge(ab);
-}
-
-void pciehprm_cleanup(void)
-{
-        pciehprm_free_bridges (acpi_bridges_head);
-}
-
-static int get_number_of_slots (
-        struct acpi_bridge      *ab,
-        int                             selfonly
-        )
-{
-        struct acpi_php_slot    *aps;
-        int     prev_slot = -1;
-        int     slot_num = 0;
-
-        for ( aps = ab->slots; aps; aps = aps->next)
-                if (aps->dev != prev_slot) {
-                        prev_slot = aps->dev;
-                        slot_num++;
-                }
-
-        if (ab->child)
-                slot_num += get_number_of_slots (ab->child, 0);
-
-        if (selfonly)
-                return slot_num;
-
-        if (ab->next)
-                slot_num += get_number_of_slots (ab->next, 0);
-
-        return slot_num;
-}
-
-static int print_acpi_resources (struct acpi_bridge     *ab)
-{
-        struct acpi_php_slot            *aps;
-        int     i;
-
-        switch (ab->type) {
-        case BRIDGE_TYPE_HOST:
-                dbg("PCI HOST Bridge (%x) [%s]\n", ab->bus, acpi_path_name(ab->handle));
-                break;
-        case BRIDGE_TYPE_P2P:
-                dbg("PCI P2P Bridge (%x-%x) [%s]\n", ab->pbus, ab->bus, acpi_path_name(ab->handle));
-                break;
-        };
-
-        print_pci_resources (ab);
-
-        for ( i = -1, aps = ab->slots; aps; aps = aps->next) {
-                if (aps->dev == i)
-                        continue;
-                dbg("  Slot sun(%x) s:b:d:f(%02x:%02x:%02x:%02x)\n", aps->sun, aps->seg, aps->bus, aps->dev, aps->fun);
-                print_slot_resources(aps);
-                i = aps->dev;
-        }
-
-        if (ab->child)
-                print_acpi_resources (ab->child);
-
-        if (ab->next)
-                print_acpi_resources (ab->next);
-
-        return 0;
-}
-
-int pciehprm_print_pirt(void)
-{
-        dbg("PCIEHPRM ACPI Slots\n");
-        if (acpi_bridges_head)
-                print_acpi_resources (acpi_bridges_head);
-
-        return 0;
-}
-
-static struct acpi_php_slot * get_acpi_slot (
-        struct acpi_bridge *ab,
-        u32 sun
-        )
-{
-        struct acpi_php_slot    *aps = NULL;
-
-        for ( aps = ab->slots; aps; aps = aps->next)
-                if (aps->sun == sun)
-                        return aps;
-
-        if (!aps && ab->child) {
-                aps = (struct acpi_php_slot *)get_acpi_slot (ab->child, sun);
-                if (aps)
-                        return aps;
-        }
-
-        if (!aps && ab->next) {
-                aps = (struct acpi_php_slot *)get_acpi_slot (ab->next, sun);
-                if (aps)
-                        return aps;
-        }
-
-        return aps;
-
-}
-
-#if 0
-void * pciehprm_get_slot(struct slot *slot)
-{
-        struct acpi_bridge      *ab = acpi_bridges_head;
-        struct acpi_php_slot    *aps = get_acpi_slot (ab, slot->number);
-
-        aps->slot = slot;
-
-        dbg("Got acpi slot sun(%x): s:b:d:f(%x:%x:%x:%x)\n", aps->sun, aps->seg, aps->bus, aps->dev, aps->fun);
-
-        return (void *)aps;
-}
-#endif
-
-static void pciehprm_dump_func_res( struct pci_func *fun)
-{
-        struct pci_func *func = fun;
-
-        if (func->bus_head) {
-                dbg(":    BUS Resources:\n");
-                print_pci_resource (func->bus_head);
-        }
-        if (func->io_head) {
-                dbg(":    IO Resources:\n");
-                print_pci_resource (func->io_head);
-        }
-        if (func->mem_head) {
-                dbg(":    MEM Resources:\n");
-                print_pci_resource (func->mem_head);
-        }
-        if (func->p_mem_head) {
-                dbg(":    PMEM Resources:\n");
-                print_pci_resource (func->p_mem_head);
-        }
-}
-
-static void pciehprm_dump_ctrl_res( struct controller *ctlr)
-{
-        struct controller *ctrl = ctlr;
-
-        if (ctrl->bus_head) {
-                dbg(":    BUS Resources:\n");
-                print_pci_resource (ctrl->bus_head);
-        }
-        if (ctrl->io_head) {
-                dbg(":    IO Resources:\n");
-                print_pci_resource (ctrl->io_head);
-        }
-        if (ctrl->mem_head) {
-                dbg(":    MEM Resources:\n");
-                print_pci_resource (ctrl->mem_head);
-        }
-        if (ctrl->p_mem_head) {
-                dbg(":    PMEM Resources:\n");
-                print_pci_resource (ctrl->p_mem_head);
-        }
-}
-
-static int pciehprm_get_used_resources (
-        struct controller *ctrl,
-        struct pci_func *func
-        )
-{
-        return pciehp_save_used_resources (ctrl, func, !DISABLE_CARD);
-}
-
-static int configure_existing_function(
-        struct controller *ctrl,
-        struct pci_func *func
-        )
-{
-        int rc;
-
-        /* see how much resources the func has used. */
-        rc = pciehprm_get_used_resources (ctrl, func);
-
-        if (!rc) {
-                /* subtract the resources used by the func from ctrl resources */
-                rc  = pciehprm_delete_resources (&ctrl->bus_head, func->bus_head);
-                rc |= pciehprm_delete_resources (&ctrl->io_head, func->io_head);
-                rc |= pciehprm_delete_resources (&ctrl->mem_head, func->mem_head);
-                rc |= pciehprm_delete_resources (&ctrl->p_mem_head, func->p_mem_head);
-                if (rc)
-                        warn("aCEF: cannot del used resources\n");
-        } else
-                err("aCEF: cannot get used resources\n");
-
-        return rc;
-}
-
-static int bind_pci_resources_to_slots ( struct controller *ctrl)
-{
-        struct pci_func *func, new_func;
-        int busn = ctrl->slot_bus;
-        int devn, funn;
-        u32     vid;
-
-        for (devn = 0; devn < 32; devn++) {
-                for (funn = 0; funn < 8; funn++) {
-                        /*
-                        if (devn == ctrl->device && funn == ctrl->function)
-                                continue;
-                        */
-                        /* find out if this entry is for an occupied slot */
-                        vid = 0xFFFFFFFF;
-                        pci_bus_read_config_dword(ctrl->pci_dev->subordinate, PCI_DEVFN(devn, funn), PCI_VENDOR_ID, &vid);
-
-                        if (vid != 0xFFFFFFFF) {
-                                dbg("%s: vid = %x\n", __FUNCTION__, vid);
-                                func = pciehp_slot_find(busn, devn, funn);
-                                if (!func) {
-                                        memset(&new_func, 0, sizeof(struct pci_func));
-                                        new_func.bus = busn;
-                                        new_func.device = devn;
-                                        new_func.function = funn;
-                                        new_func.is_a_board = 1;
-                                        configure_existing_function(ctrl, &new_func);
-                                        pciehprm_dump_func_res(&new_func);
-                                } else {
-                                        configure_existing_function(ctrl, func);
-                                        pciehprm_dump_func_res(func);
-                                }
-                                dbg("aCCF:existing PCI 0x%x Func ResourceDump\n", ctrl->bus);
-                        }
-                }
-        }
-
-        return 0;
-}
-
-static int bind_pci_resources(
-        struct controller       *ctrl,
-        struct acpi_bridge      *ab
-        )
-{
-        int             status = 0;
-
-        if (ab->bus_head) {
-                dbg("bapr:  BUS Resources add on PCI 0x%x\n", ab->bus);
-                status = pciehprm_add_resources (&ctrl->bus_head, ab->bus_head);
-                if (pciehprm_delete_resources (&ab->bus_head, ctrl->bus_head))
-                        warn("bapr:  cannot sub BUS Resource on PCI 0x%x\n", ab->bus);
-                if (status) {
-                        err("bapr:  BUS Resource add on PCI 0x%x: fail=0x%x\n", ab->bus, status);
-                        return status;
-                }
-        } else
-                info("bapr:  No BUS Resource on PCI 0x%x.\n", ab->bus);
-
-        if (ab->io_head) {
-                dbg("bapr:  IO Resources add on PCI 0x%x\n", ab->bus);
-                status = pciehprm_add_resources (&ctrl->io_head, ab->io_head);
-                if (pciehprm_delete_resources (&ab->io_head, ctrl->io_head))
-                        warn("bapr:  cannot sub IO Resource on PCI 0x%x\n", ab->bus);
-                if (status) {
-                        err("bapr:  IO Resource add on PCI 0x%x: fail=0x%x\n", ab->bus, status);
-                        return status;
-                }
-        } else
-                info("bapr:  No  IO Resource on PCI 0x%x.\n", ab->bus);
-
-        if (ab->mem_head) {
-                dbg("bapr:  MEM Resources add on PCI 0x%x\n", ab->bus);
-                status = pciehprm_add_resources (&ctrl->mem_head, ab->mem_head);
-                if (pciehprm_delete_resources (&ab->mem_head, ctrl->mem_head))
-                        warn("bapr:  cannot sub MEM Resource on PCI 0x%x\n", ab->bus);
-                if (status) {
-                        err("bapr:  MEM Resource add on PCI 0x%x: fail=0x%x\n", ab->bus, status);
-                        return status;
-                }
-        } else
-                info("bapr:  No MEM Resource on PCI 0x%x.\n", ab->bus);
-
-        if (ab->p_mem_head) {
-                dbg("bapr:  PMEM Resources add on PCI 0x%x\n", ab->bus);
-                status = pciehprm_add_resources (&ctrl->p_mem_head, ab->p_mem_head);
-                if (pciehprm_delete_resources (&ab->p_mem_head, ctrl->p_mem_head))
-                        warn("bapr:  cannot sub PMEM Resource on PCI 0x%x\n", ab->bus);
-                if (status) {
-                        err("bapr:  PMEM Resource add on PCI 0x%x: fail=0x%x\n", ab->bus, status);
-                        return status;
-                }
-        } else
-                info("bapr:  No PMEM Resource on PCI 0x%x.\n", ab->bus);
-
-        return status;
-}
-
-static int no_pci_resources( struct acpi_bridge *ab)
-{
-        return !(ab->p_mem_head || ab->mem_head || ab->io_head || ab->bus_head);
-}
-
-static int find_pci_bridge_resources (
-        struct controller *ctrl,
-        struct acpi_bridge *ab
-        )
-{
-        int     rc = 0;
-        struct pci_func func;
-
-        memset(&func, 0, sizeof(struct pci_func));
-
-        func.bus = ab->pbus;
-        func.device = ab->pdevice;
-        func.function = ab->pfunction;
-        func.is_a_board = 1;
-
-        /* Get used resources for this PCI bridge */
-        rc = pciehp_save_used_resources (ctrl, &func, !DISABLE_CARD);
-
-        ab->io_head = func.io_head;
-        ab->mem_head = func.mem_head;
-        ab->p_mem_head = func.p_mem_head;
-        ab->bus_head = func.bus_head;
-        if (ab->bus_head)
-                pciehprm_delete_resource(&ab->bus_head, ctrl->pci_dev->subordinate->number, 1);
-
-        return rc;
-}
-
-static int get_pci_resources_from_bridge(
-        struct controller *ctrl,
-        struct acpi_bridge *ab
-        )
-{
-        int     rc = 0;
-
-        dbg("grfb:  Get Resources for PCI 0x%x from actual PCI bridge 0x%x.\n", ctrl->bus, ab->bus);
-
-        rc = find_pci_bridge_resources (ctrl, ab);
-
-        pciehp_resource_sort_and_combine(&ab->bus_head);
-        pciehp_resource_sort_and_combine(&ab->io_head);
-        pciehp_resource_sort_and_combine(&ab->mem_head);
-        pciehp_resource_sort_and_combine(&ab->p_mem_head);
-
-        pciehprm_add_resources (&ab->tbus_head, ab->bus_head);
-        pciehprm_add_resources (&ab->tio_head, ab->io_head);
-        pciehprm_add_resources (&ab->tmem_head, ab->mem_head);
-        pciehprm_add_resources (&ab->tp_mem_head, ab->p_mem_head);
-
-        return rc;
-}
-
-static int get_pci_resources(
-        struct controller       *ctrl,
-        struct acpi_bridge      *ab
-        )
-{
-        int     rc = 0;
-
-        if (no_pci_resources(ab)) {
-                dbg("spbr:PCI 0x%x has no resources. Get parent resources.\n", ab->bus);
-                rc = get_pci_resources_from_bridge(ctrl, ab);
-        }
-
-        return rc;
-}
-
-/*
- * Get resources for this ctrl.
- *  1. get total resources from ACPI _CRS or bridge (this ctrl)
- *  2. find used resources of existing adapters
- *      3. subtract used resources from total resources
- */
-int pciehprm_find_available_resources( struct controller *ctrl)
-{
-        int rc = 0;
-        struct acpi_bridge      *ab;
-
-        ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->pci_dev->subordinate->number);
-        if (!ab) {
-                err("pfar:cannot locate acpi bridge of PCI 0x%x.\n", ctrl->pci_dev->subordinate->number);
-                return -1;
-        }
-        if (no_pci_resources(ab)) {
-                rc = get_pci_resources(ctrl, ab);
-                if (rc) {
-                        err("pfar:cannot get pci resources of PCI 0x%x.\n", ctrl->pci_dev->subordinate->number);
-                        return -1;
-                }
-        }
-
-        rc = bind_pci_resources(ctrl, ab);
-        dbg("pfar:pre-Bind PCI 0x%x Ctrl Resource Dump\n", ctrl->pci_dev->subordinate->number);
-        pciehprm_dump_ctrl_res(ctrl);
-
-        bind_pci_resources_to_slots (ctrl);
-
-        dbg("pfar:post-Bind PCI 0x%x Ctrl Resource Dump\n", ctrl->pci_dev->subordinate->number);
-        pciehprm_dump_ctrl_res(ctrl);
-
-        return rc;
-}
-
-int pciehprm_set_hpp(
-        struct controller *ctrl,
-        struct pci_func *func,
-        u8      card_type
-        )
-{
-        struct acpi_bridge      *ab;
-        struct pci_bus lpci_bus, *pci_bus;
-        int                             rc = 0;
-        unsigned int    devfn;
-        u8                              cls= 0x08;      /* default cache line size      */
-        u8                              lt = 0x40;      /* default latency timer        */
-        u8                              ep = 0;
-        u8                              es = 0;
-
-        memcpy(&lpci_bus, ctrl->pci_bus, sizeof(lpci_bus));
-        pci_bus = &lpci_bus;
-        pci_bus->number = func->bus;
-        devfn = PCI_DEVFN(func->device, func->function);
-
-        ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->bus);
-
-        if (ab) {
-                if (ab->_hpp) {
-                        lt  = (u8)ab->_hpp->latency_timer;
-                        cls = (u8)ab->_hpp->cache_line_size;
-                        ep  = (u8)ab->_hpp->enable_perr;
-                        es  = (u8)ab->_hpp->enable_serr;
-                } else
-                        dbg("_hpp: no _hpp for B/D/F=%#x/%#x/%#x. use default value\n", func->bus, func->device, func->function);
-        } else
-                dbg("_hpp: no acpi bridge for B/D/F = %#x/%#x/%#x. use default value\n", func->bus, func->device, func->function);
-
-
-        if (card_type == PCI_HEADER_TYPE_BRIDGE) {
-                /* set subordinate Latency Timer */
-                rc |= pci_bus_write_config_byte(pci_bus, devfn, PCI_SEC_LATENCY_TIMER, lt);
+        while (pdev && (ACPI_FAILURE(status))) {
+                acpi_handle handle = DEVICE_ACPI_HANDLE(&(pdev->dev));
+                if (!handle)
+                        break;
+                status = acpi_run_hpp(handle, hpp);
+                if (!(pdev->bus->parent))
+                        break;
+                /* Check if a parent object supports _HPP */
+                pdev = pdev->bus->parent->self;
         }
-
-        /* set base Latency Timer */
-        rc |= pci_bus_write_config_byte(pci_bus, devfn, PCI_LATENCY_TIMER, lt);
-        dbg("  set latency timer  =0x%02x: %x\n", lt, rc);
-
-        rc |= pci_bus_write_config_byte(pci_bus, devfn, PCI_CACHE_LINE_SIZE, cls);
-        dbg("  set cache_line_size=0x%02x: %x\n", cls, rc);
-
-        return rc;
 }
 
-void pciehprm_enable_card(
-        struct controller *ctrl,
-        struct pci_func *func,
-        u8 card_type)
-{
-        u16 command, cmd, bcommand, bcmd;
-        struct pci_bus lpci_bus, *pci_bus;
-        struct acpi_bridge      *ab;
-        unsigned int devfn;
-        int rc;
-
-        memcpy(&lpci_bus, ctrl->pci_bus, sizeof(lpci_bus));
-        pci_bus = &lpci_bus;
-        pci_bus->number = func->bus;
-        devfn = PCI_DEVFN(func->device, func->function);
-
-        rc = pci_bus_read_config_word(pci_bus, devfn, PCI_COMMAND, &cmd);
-
-        if (card_type == PCI_HEADER_TYPE_BRIDGE) {
-                rc = pci_bus_read_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, &bcmd);
-        }
-
-        command  = cmd | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE
-                | PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
-        bcommand  = bcmd | PCI_BRIDGE_CTL_NO_ISA;
-
-        ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->bus);
-        if (ab) {
-                if (ab->_hpp) {
-                        if (ab->_hpp->enable_perr) {
-                                command |= PCI_COMMAND_PARITY;
-                                bcommand |= PCI_BRIDGE_CTL_PARITY;
-                        } else {
-                                command &= ~PCI_COMMAND_PARITY;
-                                bcommand &= ~PCI_BRIDGE_CTL_PARITY;
-                        }
-                        if (ab->_hpp->enable_serr) {
-                                command |= PCI_COMMAND_SERR;
-                                bcommand |= PCI_BRIDGE_CTL_SERR;
-                        } else {
-                                command &= ~PCI_COMMAND_SERR;
-                                bcommand &= ~PCI_BRIDGE_CTL_SERR;
-                        }
-                } else
-                        dbg("no _hpp for B/D/F = %#x/%#x/%#x.\n", func->bus, func->device, func->function);
-        } else
-                dbg("no acpi bridge for B/D/F = %#x/%#x/%#x.\n", func->bus, func->device, func->function);
-
-        if (command != cmd) {
-                rc = pci_bus_write_config_word(pci_bus, devfn, PCI_COMMAND, command);
-        }
-        if ((card_type == PCI_HEADER_TYPE_BRIDGE) && (bcommand != bcmd)) {
-                rc = pci_bus_write_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, bcommand);
-        }
-}
diff --git a/drivers/pci/hotplug/pciehprm_nonacpi.c b/drivers/pci/hotplug/pciehprm_nonacpi.c
index 76c727c74cc0..29180dfe8493 100644
--- a/drivers/pci/hotplug/pciehprm_nonacpi.c
+++ b/drivers/pci/hotplug/pciehprm_nonacpi.c
@@ -27,479 +27,21 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/pci.h>
-#include <linux/init.h>
 #include <linux/slab.h>
-
-#include <asm/uaccess.h>
-#ifdef CONFIG_IA64
-#include <asm/iosapic.h>
-#endif
-
 #include "pciehp.h"
-#include "pciehprm.h"
-#include "pciehprm_nonacpi.h"
-
 
-void pciehprm_cleanup(void)
+void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
+                struct hotplug_params *hpp)
 {
         return;
 }
 
-int pciehprm_print_pirt(void)
-{
-        return 0;
-}
-
-int pciehprm_get_physical_slot_number(struct controller *ctrl, u32 *sun, u8 busnum, u8 devnum)
-{
-
-        *sun = (u8) (ctrl->first_slot);
-        return 0;
-}
-
-
-static void print_pci_resource ( struct pci_resource    *aprh)
-{
-        struct pci_resource     *res;
-
-        for (res = aprh; res; res = res->next)
-                dbg("        base= 0x%x length= 0x%x\n", res->base, res->length);
-}
-
-
-static void phprm_dump_func_res( struct pci_func *fun)
-{
-        struct pci_func *func = fun;
-
-        if (func->bus_head) {
-                dbg(":    BUS Resources:\n");
-                print_pci_resource (func->bus_head);
-        }
-        if (func->io_head) {
-                dbg(":    IO Resources:\n");
-                print_pci_resource (func->io_head);
-        }
-        if (func->mem_head) {
-                dbg(":    MEM Resources:\n");
-                print_pci_resource (func->mem_head);
-        }
-        if (func->p_mem_head) {
-                dbg(":    PMEM Resources:\n");
-                print_pci_resource (func->p_mem_head);
-        }
-}
-
-static int phprm_get_used_resources (
-        struct controller *ctrl,
-        struct pci_func *func
-        )
-{
-        return pciehp_save_used_resources (ctrl, func, !DISABLE_CARD);
-}
-
-static int phprm_delete_resource(
-        struct pci_resource **aprh,
-        ulong base,
-        ulong size)
-{
-        struct pci_resource *res;
-        struct pci_resource *prevnode;
-        struct pci_resource *split_node;
-        ulong tbase;
-
-        pciehp_resource_sort_and_combine(aprh);
-
-        for (res = *aprh; res; res = res->next) {
-                if (res->base > base)
-                        continue;
-
-                if ((res->base + res->length) < (base + size))
-                        continue;
-
-                if (res->base < base) {
-                        tbase = base;
-
-                        if ((res->length - (tbase - res->base)) < size)
-                                continue;
-
-                        split_node = (struct pci_resource *) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-                        if (!split_node)
-                                return -ENOMEM;
-
-                        split_node->base = res->base;
-                        split_node->length = tbase - res->base;
-                        res->base = tbase;
-                        res->length -= split_node->length;
-
-                        split_node->next = res->next;
-                        res->next = split_node;
-                }
-
-                if (res->length >= size) {
-                        split_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-                        if (!split_node)
-                                return -ENOMEM;
-
-                        split_node->base = res->base + size;
-                        split_node->length = res->length - size;
-                        res->length = size;
-
-                        split_node->next = res->next;
-                        res->next = split_node;
-                }
-
-                if (*aprh == res) {
-                        *aprh = res->next;
-                } else {
-                        prevnode = *aprh;
-                        while (prevnode->next != res)
-                                prevnode = prevnode->next;
-
-                        prevnode->next = res->next;
-                }
-                res->next = NULL;
-                kfree(res);
-                break;
-        }
-
-        return 0;
-}
-
-
-static int phprm_delete_resources(
-        struct pci_resource **aprh,
-        struct pci_resource *this
-        )
-{
-        struct pci_resource *res;
-
-        for (res = this; res; res = res->next)
-                phprm_delete_resource(aprh, res->base, res->length);
-
-        return 0;
-}
-
-
-static int configure_existing_function(
-        struct controller *ctrl,
-        struct pci_func *func
-        )
-{
-        int rc;
-
-        /* see how much resources the func has used. */
-        rc = phprm_get_used_resources (ctrl, func);
-
-        if (!rc) {
-                /* subtract the resources used by the func from ctrl resources */
-                rc  = phprm_delete_resources (&ctrl->bus_head, func->bus_head);
-                rc |= phprm_delete_resources (&ctrl->io_head, func->io_head);
-                rc |= phprm_delete_resources (&ctrl->mem_head, func->mem_head);
-                rc |= phprm_delete_resources (&ctrl->p_mem_head, func->p_mem_head);
-                if (rc)
-                        warn("aCEF: cannot del used resources\n");
-        } else
-                err("aCEF: cannot get used resources\n");
-
-        return rc;
-}
-
-static int pciehprm_delete_resource(
-        struct pci_resource **aprh,
-        ulong base,
-        ulong size)
-{
-        struct pci_resource *res;
-        struct pci_resource *prevnode;
-        struct pci_resource *split_node;
-        ulong tbase;
-
-        pciehp_resource_sort_and_combine(aprh);
-
-        for (res = *aprh; res; res = res->next) {
-                if (res->base > base)
-                        continue;
-
-                if ((res->base + res->length) < (base + size))
-                        continue;
-
-                if (res->base < base) {
-                        tbase = base;
-
-                        if ((res->length - (tbase - res->base)) < size)
-                                continue;
-
-                        split_node = (struct pci_resource *) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-                        if (!split_node)
-                                return -ENOMEM;
-
-                        split_node->base = res->base;
-                        split_node->length = tbase - res->base;
-                        res->base = tbase;
-                        res->length -= split_node->length;
-
-                        split_node->next = res->next;
-                        res->next = split_node;
-                }
-
-                if (res->length >= size) {
-                        split_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
-                        if (!split_node)
-                                return -ENOMEM;
-
-                        split_node->base = res->base + size;
-                        split_node->length = res->length - size;
-                        res->length = size;
-
-                        split_node->next = res->next;
-                        res->next = split_node;
-                }
-
-                if (*aprh == res) {
-                        *aprh = res->next;
-                } else {
-                        prevnode = *aprh;
-                        while (prevnode->next != res)
-                                prevnode = prevnode->next;
-
-                        prevnode->next = res->next;
-                }
-                res->next = NULL;
-                kfree(res);
-                break;
-        }
-
-        return 0;
-}
-
-static int bind_pci_resources_to_slots ( struct controller *ctrl)
+int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
 {
-        struct pci_func *func, new_func;
-        int busn = ctrl->slot_bus;
-        int devn, funn;
-        u32     vid;
-
-        for (devn = 0; devn < 32; devn++) {
-                for (funn = 0; funn < 8; funn++) {
-                        /*
-                        if (devn == ctrl->device && funn == ctrl->function)
-                                continue;
-                        */
-                        /* find out if this entry is for an occupied slot */
-                        vid = 0xFFFFFFFF;
-
-                        pci_bus_read_config_dword(ctrl->pci_dev->subordinate, PCI_DEVFN(devn, funn), PCI_VENDOR_ID, &vid);
-
-                        if (vid != 0xFFFFFFFF) {
-                                dbg("%s: vid = %x bus %x dev %x fun %x\n", __FUNCTION__,
-                                vid, busn, devn, funn);
-                                func = pciehp_slot_find(busn, devn, funn);
-                                dbg("%s: func = %p\n", __FUNCTION__,func);
-                                if (!func) {
-                                        memset(&new_func, 0, sizeof(struct pci_func));
-                                        new_func.bus = busn;
-                                        new_func.device = devn;
-                                        new_func.function = funn;
-                                        new_func.is_a_board = 1;
-                                        configure_existing_function(ctrl, &new_func);
-                                        phprm_dump_func_res(&new_func);
-                                } else {
-                                        configure_existing_function(ctrl, func);
-                                        phprm_dump_func_res(func);
-                                }
-                                dbg("aCCF:existing PCI 0x%x Func ResourceDump\n", ctrl->bus);
-                        }
-                }
-        }
-
         return 0;
 }
-
-static void phprm_dump_ctrl_res( struct controller *ctlr)
-{
-        struct controller *ctrl = ctlr;
-
-        if (ctrl->bus_head) {
-                dbg(":    BUS Resources:\n");
-                print_pci_resource (ctrl->bus_head);
-        }
-        if (ctrl->io_head) {
-                dbg(":    IO Resources:\n");
-                print_pci_resource (ctrl->io_head);
-        }
-        if (ctrl->mem_head) {
-                dbg(":    MEM Resources:\n");
-                print_pci_resource (ctrl->mem_head);
-        }
-        if (ctrl->p_mem_head) {
-                dbg(":    PMEM Resources:\n");
-                print_pci_resource (ctrl->p_mem_head);
-        }
-}
-
-/*
- * phprm_find_available_resources
- *
- *  Finds available memory, IO, and IRQ resources for programming
- *  devices which may be added to the system
- *  this function is for hot plug ADD!
- *
- * returns 0 if success
- */
-int pciehprm_find_available_resources(struct controller *ctrl)
-{
-        struct pci_func func;
-        u32 rc;
-
-        memset(&func, 0, sizeof(struct pci_func));
-
-        func.bus = ctrl->bus;
-        func.device = ctrl->device;
-        func.function = ctrl->function;
-        func.is_a_board = 1;
-
-        /* Get resources for this PCI bridge */
-        rc = pciehp_save_used_resources (ctrl, &func, !DISABLE_CARD);
-        dbg("%s: pciehp_save_used_resources rc = %d\n", __FUNCTION__, rc);
-
-        if (func.mem_head)
-                func.mem_head->next = ctrl->mem_head;
-        ctrl->mem_head = func.mem_head;
-
-        if (func.p_mem_head)
-                func.p_mem_head->next = ctrl->p_mem_head;
-        ctrl->p_mem_head = func.p_mem_head;
-
-        if (func.io_head)
-                func.io_head->next = ctrl->io_head;
-        ctrl->io_head = func.io_head;
-
-        if(func.bus_head)
-                func.bus_head->next = ctrl->bus_head;
-        ctrl->bus_head = func.bus_head;
-
-        if (ctrl->bus_head)
-                pciehprm_delete_resource(&ctrl->bus_head, ctrl->pci_dev->subordinate->number, 1);
-        
-        dbg("%s:pre-Bind PCI 0x%x Ctrl Resource Dump\n", __FUNCTION__, ctrl->bus);
-        phprm_dump_ctrl_res(ctrl);
-
-        dbg("%s: before bind_pci_resources_to slots\n", __FUNCTION__);
-
-        bind_pci_resources_to_slots (ctrl);
-
-        dbg("%s:post-Bind PCI 0x%x Ctrl Resource Dump\n", __FUNCTION__, ctrl->bus);
-        phprm_dump_ctrl_res(ctrl);
-
-        return (rc);
-}
-
-int pciehprm_set_hpp(
-        struct controller *ctrl,
-        struct pci_func *func,
-        u8      card_type)
-{
-        u32 rc;
-        u8 temp_byte;
-        struct pci_bus lpci_bus, *pci_bus;
-        unsigned int    devfn;
-        memcpy(&lpci_bus, ctrl->pci_bus, sizeof(lpci_bus));
-        pci_bus = &lpci_bus;
-        pci_bus->number = func->bus;
-        devfn = PCI_DEVFN(func->device, func->function);
-
-        temp_byte = 0x40;       /* hard coded value for LT */
-        if (card_type == PCI_HEADER_TYPE_BRIDGE) {
-                /* set subordinate Latency Timer */
-                rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_SEC_LATENCY_TIMER, temp_byte);
-
-                if (rc) {
-                        dbg("%s: set secondary LT error. b:d:f(%02x:%02x:%02x)\n", __FUNCTION__, 
-                                func->bus, func->device, func->function);
-                        return rc;
-                }
-        }
-
-        /* set base Latency Timer */
-        rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_LATENCY_TIMER, temp_byte);
-
-        if (rc) {
-                dbg("%s: set LT error. b:d:f(%02x:%02x:%02x)\n", __FUNCTION__, func->bus, func->device, func->function);
-                return rc;
-        }
-
-        /* set Cache Line size */
-        temp_byte = 0x08;       /* hard coded value for CLS */
-
-        rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_CACHE_LINE_SIZE, temp_byte);
-
-        if (rc) {
-                dbg("%s: set CLS error. b:d:f(%02x:%02x:%02x)\n", __FUNCTION__, func->bus, func->device, func->function);
-        }
-
-        /* set enable_perr */
-        /* set enable_serr */
-
-        return rc;
-}
-
-void pciehprm_enable_card(
-        struct controller *ctrl,
-        struct pci_func *func,
-        u8 card_type)
-{
-        u16 command, bcommand;
-        struct pci_bus lpci_bus, *pci_bus;
-        unsigned int devfn;
-        int rc;
-
-        memcpy(&lpci_bus, ctrl->pci_bus, sizeof(lpci_bus));
-        pci_bus = &lpci_bus;
-        pci_bus->number = func->bus;
-        devfn = PCI_DEVFN(func->device, func->function);
-
-        rc = pci_bus_read_config_word(pci_bus, devfn, PCI_COMMAND, &command);
-
-        command |= PCI_COMMAND_PARITY | PCI_COMMAND_SERR
-                | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE
-                | PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
-
-        rc = pci_bus_write_config_word(pci_bus, devfn, PCI_COMMAND, command);
-
-        if (card_type == PCI_HEADER_TYPE_BRIDGE) {
-
-                rc = pci_bus_read_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, &bcommand);
-
-                bcommand |= PCI_BRIDGE_CTL_PARITY | PCI_BRIDGE_CTL_SERR
-                        | PCI_BRIDGE_CTL_NO_ISA;
-
-                rc = pci_bus_write_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, bcommand);
-        }
-}
-
-static int legacy_pciehprm_init_pci(void)
-{
-        return 0;
-}
-
-int pciehprm_init(enum php_ctlr_type ctrl_type)
-{
-        int retval;
-
-        switch (ctrl_type) {
-        case PCI:
-                retval = legacy_pciehprm_init_pci();
-                break;
-        default:
-                retval = -ENODEV;
-                break;
-        }
-
-        return retval;
-}
diff --git a/drivers/pci/hotplug/pciehprm_nonacpi.h b/drivers/pci/hotplug/pciehprm_nonacpi.h
deleted file mode 100644
index b10603b0e958..000000000000
--- a/drivers/pci/hotplug/pciehprm_nonacpi.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * PCIEHPRM NONACPI: PHP Resource Manager for Non-ACPI/Legacy platform
- *
- * Copyright (C) 1995,2001 Compaq Computer Corporation
- * Copyright (C) 2001 Greg Kroah-Hartman (greg@kroah.com)
- * Copyright (C) 2001 IBM Corp.
- * Copyright (C) 2003-2004 Intel Corporation
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Send feedback to <greg@kroah.com>, <kristen.c.accardi@intel.com>
- *
- */
-
-#ifndef _PCIEHPRM_NONACPI_H_
-#define _PCIEHPRM_NONACPI_H_
-
-struct irq_info {
-        u8 bus, devfn;          /* bus, device and function */
-        struct {
-                u8 link;        /* IRQ line ID, chipset dependent, 0=not routed */
-                u16 bitmap;     /* Available IRQs */
-        } __attribute__ ((packed)) irq[4];
-        u8 slot;                /* slot number, 0=onboard */
-        u8 rfu;
-} __attribute__ ((packed));
-
-struct irq_routing_table {
-        u32 signature;          /* PIRQ_SIGNATURE should be here */
-        u16 version;            /* PIRQ_VERSION */
-        u16 size;                       /* Table size in bytes */
-        u8 rtr_bus, rtr_devfn;  /* Where the interrupt router lies */
-        u16 exclusive_irqs;     /* IRQs devoted exclusively to PCI usage */
-        u16 rtr_vendor, rtr_device;     /* Vendor and device ID of interrupt router */
-        u32 miniport_data;      /* Crap */
-        u8 rfu[11];
-        u8 checksum;            /* Modulo 256 checksum must give zero */
-        struct irq_info slots[0];
-} __attribute__ ((packed));
-
-#endif                          /* _PCIEHPRM_NONACPI_H_ */
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index fcb66b9a0e28..cc03609f45d0 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -134,43 +134,6 @@ static void rpadlpar_claim_one_bus(struct pci_bus *b)
                 rpadlpar_claim_one_bus(child_bus);
 }
 
-static int pci_add_secondary_bus(struct device_node *dn,
-                struct pci_dev *bridge_dev)
-{
-        struct pci_dn *pdn = dn->data;
-        struct pci_controller *hose = pdn->phb;
-        struct pci_bus *child;
-        u8 sec_busno;
-
-        /* Get busno of downstream bus */
-        pci_read_config_byte(bridge_dev, PCI_SECONDARY_BUS, &sec_busno);
-
-        /* Allocate and add to children of bridge_dev->bus */
-        child = pci_add_new_bus(bridge_dev->bus, bridge_dev, sec_busno);
-        if (!child) {
-                printk(KERN_ERR "%s: could not add secondary bus\n", __FUNCTION__);
-                return -ENOMEM;
-        }
-
-        sprintf(child->name, "PCI Bus #%02x", child->number);
-
-        /* Fixup subordinate bridge bases and resources */
-        pcibios_fixup_bus(child);
-
-        /* Claim new bus resources */
-        rpadlpar_claim_one_bus(bridge_dev->bus);
-
-        if (hose->last_busno < child->number)
-                hose->last_busno = child->number;
-
-        pdn->bussubno = child->number;
-
-        /* ioremap() for child bus, which may or may not succeed */
-        remap_bus_range(child);
-
-        return 0;
-}
-
 static struct pci_dev *dlpar_find_new_dev(struct pci_bus *parent,
                                         struct device_node *dev_dn)
 {
@@ -188,29 +151,41 @@ static struct pci_dev *dlpar_find_new_dev(struct pci_bus *parent,
 static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn)
 {
         struct pci_dn *pdn = dn->data;
-        struct pci_controller *hose = pdn->phb;
+        struct pci_controller *phb = pdn->phb;
         struct pci_dev *dev = NULL;
 
-        /* Scan phb bus for EADS device, adding new one to bus->devices */
-        if (!pci_scan_single_device(hose->bus, pdn->devfn)) {
-                printk(KERN_ERR "%s: found no device on bus\n", __FUNCTION__);
+        rpaphp_eeh_init_nodes(dn);
+        /* Add EADS device to PHB bus, adding new entry to bus->devices */
+        dev = of_create_pci_dev(dn, phb->bus, pdn->devfn);
+        if (!dev) {
+                printk(KERN_ERR "%s: failed to create pci dev for %s\n",
+                                __FUNCTION__, dn->full_name);
                 return NULL;
         }
 
+        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
+            dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
+                of_scan_pci_bridge(dn, dev);
+
+        rpaphp_init_new_devs(dev->subordinate);
+
+        /* Claim new bus resources */
+        rpadlpar_claim_one_bus(dev->bus);
+
+        /* ioremap() for child bus, which may or may not succeed */
+        (void) remap_bus_range(dev->bus);
+
         /* Add new devices to global lists.  Register in proc, sysfs. */
-        pci_bus_add_devices(hose->bus);
+        pci_bus_add_devices(phb->bus);
 
         /* Confirm new bridge dev was created */
-        dev = dlpar_find_new_dev(hose->bus, dn);
+        dev = dlpar_find_new_dev(phb->bus, dn);
         if (dev) {
                 if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
                         printk(KERN_ERR "%s: unexpected header type %d\n",
                                 __FUNCTION__, dev->hdr_type);
                         return NULL;
                 }
-
-                if (pci_add_secondary_bus(dn, dev))
-                        return NULL;
         }
 
         return dev;
@@ -219,7 +194,6 @@ static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn)
 static int dlpar_add_pci_slot(char *drc_name, struct device_node *dn)
 {
         struct pci_dev *dev;
-        int rc;
 
         if (rpaphp_find_pci_bus(dn))
                 return -EINVAL;
@@ -232,15 +206,6 @@ static int dlpar_add_pci_slot(char *drc_name, struct device_node *dn)
                 return -EIO;
         }
 
-        if (dn->child) {
-                rc = rpaphp_config_pci_adapter(dev->subordinate);
-                if (rc < 0) {
-                        printk(KERN_ERR "%s: unable to enable slot %s\n",
-                                __FUNCTION__, drc_name);
-                        return -EIO;
-                }
-        }
-
         /* Add hotplug slot */
         if (rpaphp_add_slot(dn)) {
                 printk(KERN_ERR "%s: unable to add hotplug slot %s\n",
@@ -306,7 +271,7 @@ static int dlpar_add_phb(char *drc_name, struct device_node *dn)
 {
         struct pci_controller *phb;
 
-        if (PCI_DN(dn)->phb) {
+        if (PCI_DN(dn) && PCI_DN(dn)->phb) {
                 /* PHB already exists */
                 return -EINVAL;
         }
@@ -435,6 +400,8 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
                                 __FUNCTION__, drc_name);
                         return -EIO;
                 }
+        } else {
+                rpaphp_unconfig_pci_adapter(bus);
         }
 
         if (unmap_bus_range(bus)) {
diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index 71ea5f9bb284..57ea71a7bda5 100644
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -93,6 +93,8 @@ extern int rpaphp_claim_resource(struct pci_dev *dev, int resource);
 extern int rpaphp_enable_pci_slot(struct slot *slot);
 extern int register_pci_slot(struct slot *slot);
 extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);
+extern void rpaphp_init_new_devs(struct pci_bus *bus);
+extern void rpaphp_eeh_init_nodes(struct device_node *dn);
 
 extern int rpaphp_config_pci_adapter(struct pci_bus *bus);
 extern int rpaphp_unconfig_pci_adapter(struct pci_bus *bus);
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index f7c12d7dfcfc..a7859a84d1ae 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -154,8 +154,7 @@ exit:
 }
 
 /* Must be called before pci_bus_add_devices */
-static void 
-rpaphp_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus)
+void rpaphp_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus)
 {
         struct pci_dev *dev;
 
@@ -184,6 +183,20 @@ rpaphp_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus)
         }
 }
 
+static void rpaphp_eeh_add_bus_device(struct pci_bus *bus)
+{
+        struct pci_dev *dev;
+
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                eeh_add_device_late(dev);
+                if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
+                        struct pci_bus *subbus = dev->subordinate;
+                        if (subbus)
+                                rpaphp_eeh_add_bus_device (subbus);
+                }
+        }
+}
+
 static int rpaphp_pci_config_bridge(struct pci_dev *dev)
 {
         u8 sec_busno;
@@ -217,6 +230,13 @@ static int rpaphp_pci_config_bridge(struct pci_dev *dev)
         return 0;
 }
 
+void rpaphp_init_new_devs(struct pci_bus *bus)
+{
+        rpaphp_fixup_new_pci_devices(bus, 0);
+        rpaphp_eeh_add_bus_device(bus);
+}
+EXPORT_SYMBOL_GPL(rpaphp_init_new_devs);
+
 /*****************************************************************************
  rpaphp_pci_config_slot() will  configure all devices under the
  given slot->dn and return the the first pci_dev.
@@ -233,36 +253,51 @@ rpaphp_pci_config_slot(struct pci_bus *bus)
         if (!dn || !dn->child)
                 return NULL;
 
-        slotno = PCI_SLOT(PCI_DN(dn->child)->devfn);
+        if (systemcfg->platform == PLATFORM_PSERIES_LPAR) {
+                of_scan_bus(dn, bus);
+                if (list_empty(&bus->devices)) {
+                        err("%s: No new device found\n", __FUNCTION__);
+                        return NULL;
+                }
 
-        /* pci_scan_slot should find all children */
-        num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
-        if (num) {
-                rpaphp_fixup_new_pci_devices(bus, 1);
+                rpaphp_init_new_devs(bus);
                 pci_bus_add_devices(bus);
-        }
-        if (list_empty(&bus->devices)) {
-                err("%s: No new device found\n", __FUNCTION__);
-                return NULL;
-        }
-        list_for_each_entry(dev, &bus->devices, bus_list) {
-                if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)
-                        rpaphp_pci_config_bridge(dev);
+                dev = list_entry(&bus->devices, struct pci_dev, bus_list);
+        } else {
+                slotno = PCI_SLOT(PCI_DN(dn->child)->devfn);
+
+                /* pci_scan_slot should find all children */
+                num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
+                if (num) {
+                        rpaphp_fixup_new_pci_devices(bus, 1);
+                        pci_bus_add_devices(bus);
+                }
+                if (list_empty(&bus->devices)) {
+                        err("%s: No new device found\n", __FUNCTION__);
+                        return NULL;
+                }
+                list_for_each_entry(dev, &bus->devices, bus_list) {
+                        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)
+                                rpaphp_pci_config_bridge(dev);
+
+                        rpaphp_eeh_add_bus_device(bus);
+                }
         }
 
         return dev;
 }
 
-static void enable_eeh(struct device_node *dn)
+void rpaphp_eeh_init_nodes(struct device_node *dn)
 {
         struct device_node *sib;
 
         for (sib = dn->child; sib; sib = sib->sibling) 
-                enable_eeh(sib);
+                rpaphp_eeh_init_nodes(sib);
         eeh_add_device_early(dn);
         return;
         
 }
+EXPORT_SYMBOL_GPL(rpaphp_eeh_init_nodes);
 
 static void print_slot_pci_funcs(struct pci_bus *bus)
 {
@@ -289,7 +324,7 @@ int rpaphp_config_pci_adapter(struct pci_bus *bus)
         if (!dn)
                 goto exit;
 
-        enable_eeh(dn);
+        rpaphp_eeh_init_nodes(dn);
         dev = rpaphp_pci_config_slot(bus);
         if (!dev) {
                 err("%s: can't find any devices.\n", __FUNCTION__);
@@ -331,6 +366,7 @@ int rpaphp_unconfig_pci_adapter(struct pci_bus *bus)
         }
         return 0;
 }
+EXPORT_SYMBOL_GPL(rpaphp_unconfig_pci_adapter);
 
 static int setup_pci_hotplug_slot_info(struct slot *slot)
 {
@@ -444,8 +480,8 @@ int rpaphp_enable_pci_slot(struct slot *slot)
                 retval = rpaphp_config_pci_adapter(slot->bus);
                 if (!retval) {
                         slot->state = CONFIGURED;
-                        dbg("%s: PCI devices in slot[%s] has been configured\n", 
-                                __FUNCTION__, slot->name);
+                        info("%s: devices in slot[%s] configured\n",
+                                        __FUNCTION__, slot->name);
                 } else {
                         slot->state = NOT_CONFIGURED;
                         dbg("%s: no pci_dev struct for adapter in slot[%s]\n",
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index b8e95acea3b6..38009bc0fd5d 100644
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -34,7 +34,7 @@
 #include "../pci.h"
 #include "shpchp.h"
 
-void program_fw_provided_values(struct pci_dev *dev)
+static void program_fw_provided_values(struct pci_dev *dev)
 {
         u16 pci_cmd, pci_bctl;
         struct pci_dev *cdev;
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index a2033552423c..202b7507a357 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -23,6 +23,8 @@
 #include "pci.h"
 #include "msi.h"
 
+#define MSI_TARGET_CPU          first_cpu(cpu_online_map)
+
 static DEFINE_SPINLOCK(msi_lock);
 static struct msi_desc* msi_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = NULL };
 static kmem_cache_t* msi_cachep;
@@ -92,6 +94,7 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
         struct msi_desc *entry;
         struct msg_address address;
         unsigned int irq = vector;
+        unsigned int dest_cpu = first_cpu(cpu_mask);
 
         entry = (struct msi_desc *)msi_desc[vector];
         if (!entry || !entry->dev)
@@ -108,9 +111,9 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
                 pci_read_config_dword(entry->dev, msi_lower_address_reg(pos),
                         &address.lo_address.value);
                 address.lo_address.value &= MSI_ADDRESS_DEST_ID_MASK;
-                address.lo_address.value |= (cpu_mask_to_apicid(cpu_mask) <<
-                        MSI_TARGET_CPU_SHIFT);
-                entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
+                address.lo_address.value |= (cpu_physical_id(dest_cpu) <<
+                                                                        MSI_TARGET_CPU_SHIFT);
+                entry->msi_attrib.current_cpu = cpu_physical_id(dest_cpu);
                 pci_write_config_dword(entry->dev, msi_lower_address_reg(pos),
                         address.lo_address.value);
                 set_native_irq_info(irq, cpu_mask);
@@ -123,9 +126,9 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
 
                 address.lo_address.value = readl(entry->mask_base + offset);
                 address.lo_address.value &= MSI_ADDRESS_DEST_ID_MASK;
-                address.lo_address.value |= (cpu_mask_to_apicid(cpu_mask) <<
-                        MSI_TARGET_CPU_SHIFT);
-                entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
+                address.lo_address.value |= (cpu_physical_id(dest_cpu) <<
+                                                                        MSI_TARGET_CPU_SHIFT);
+                entry->msi_attrib.current_cpu = cpu_physical_id(dest_cpu);
                 writel(address.lo_address.value, entry->mask_base + offset);
                 set_native_irq_info(irq, cpu_mask);
                 break;
@@ -259,14 +262,15 @@ static void msi_data_init(struct msg_data *msi_data,
 static void msi_address_init(struct msg_address *msi_address)
 {
         unsigned int    dest_id;
+        unsigned long   dest_phys_id = cpu_physical_id(MSI_TARGET_CPU);
 
         memset(msi_address, 0, sizeof(struct msg_address));
         msi_address->hi_address = (u32)0;
         dest_id = (MSI_ADDRESS_HEADER << MSI_ADDRESS_HEADER_SHIFT);
-        msi_address->lo_address.u.dest_mode = MSI_DEST_MODE;
+        msi_address->lo_address.u.dest_mode = MSI_PHYSICAL_MODE;
         msi_address->lo_address.u.redirection_hint = MSI_REDIRECTION_HINT_MODE;
         msi_address->lo_address.u.dest_id = dest_id;
-        msi_address->lo_address.value |= (MSI_TARGET_CPU << MSI_TARGET_CPU_SHIFT);
+        msi_address->lo_address.value |= (dest_phys_id << MSI_TARGET_CPU_SHIFT);
 }
 
 static int msi_free_vector(struct pci_dev* dev, int vector, int reassign);
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index e9e37abe1f76..a9b00cc2d885 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -91,9 +91,7 @@ acpi_query_osc (
 static acpi_status  
 acpi_run_osc (
         acpi_handle     handle,
-        u32             level,
-        void            *context,
-        void            **retval )
+        void            *context)
 {
         acpi_status             status;
         struct acpi_object_list input;
@@ -184,7 +182,7 @@ EXPORT_SYMBOL(pci_osc_support_set);
  *
  * Attempt to take control from Firmware on requested control bits.
  **/
-acpi_status pci_osc_control_set(u32 flags)
+acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
 {
         acpi_status     status;
         u32             ctrlset;
@@ -198,10 +196,7 @@ acpi_status pci_osc_control_set(u32 flags)
                 return AE_SUPPORT;
         }
         ctrlset_buf[OSC_CONTROL_TYPE] |= ctrlset;
-        status = acpi_get_devices ( PCI_ROOT_HID_STRING,
-                                acpi_run_osc,
-                                ctrlset_buf,
-                                NULL );
+        status = acpi_run_osc(handle, ctrlset_buf);
         if (ACPI_FAILURE (status)) {
                 ctrlset_buf[OSC_CONTROL_TYPE] &= ~ctrlset;
         }
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 94e68c54d273..a9046d4b8af3 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -37,7 +37,7 @@ struct pci_dynid {
  * Adds a new dynamic pci device ID to this driver,
  * and causes the driver to probe for all devices again.
  */
-static inline ssize_t
+static ssize_t
 store_new_id(struct device_driver *driver, const char *buf, size_t count)
 {
         struct pci_dynid *dynid;
@@ -364,15 +364,16 @@ static struct kobj_type pci_driver_kobj_type = {
 };
 
 /**
- * pci_register_driver - register a new pci driver
+ * __pci_register_driver - register a new pci driver
  * @drv: the driver structure to register
+ * @owner: owner module of drv
  * 
  * Adds the driver structure to the list of registered drivers.
  * Returns a negative value on error, otherwise 0. 
  * If no error occurred, the driver remains registered even if 
  * no device was claimed during registration.
  */
-int pci_register_driver(struct pci_driver *drv)
+int __pci_register_driver(struct pci_driver *drv, struct module *owner)
 {
         int error;
 
@@ -389,7 +390,7 @@ int pci_register_driver(struct pci_driver *drv)
                 printk(KERN_WARNING "Warning: PCI driver %s has a struct "
                         "device_driver shutdown method, please update!\n",
                         drv->name);
-        drv->driver.owner = drv->owner;
+        drv->driver.owner = owner;
         drv->driver.kobj.ktype = &pci_driver_kobj_type;
 
         spin_lock_init(&drv->dynids.lock);
@@ -526,7 +527,7 @@ postcore_initcall(pci_driver_init);
 
 EXPORT_SYMBOL(pci_match_id);
 EXPORT_SYMBOL(pci_match_device);
-EXPORT_SYMBOL(pci_register_driver);
+EXPORT_SYMBOL(__pci_register_driver);
 EXPORT_SYMBOL(pci_unregister_driver);
 EXPORT_SYMBOL(pci_dev_driver);
 EXPORT_SYMBOL(pci_bus_type);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e74d75843047..8e287a828d5d 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -63,11 +63,38 @@ pci_max_busnr(void)
         return max;
 }
 
+static int __pci_find_next_cap(struct pci_bus *bus, unsigned int devfn, u8 pos, int cap)
+{
+        u8 id;
+        int ttl = 48;
+
+        while (ttl--) {
+                pci_bus_read_config_byte(bus, devfn, pos, &pos);
+                if (pos < 0x40)
+                        break;
+                pos &= ~3;
+                pci_bus_read_config_byte(bus, devfn, pos + PCI_CAP_LIST_ID,
+                                         &id);
+                if (id == 0xff)
+                        break;
+                if (id == cap)
+                        return pos;
+                pos += PCI_CAP_LIST_NEXT;
+        }
+        return 0;
+}
+
+int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap)
+{
+        return __pci_find_next_cap(dev->bus, dev->devfn,
+                                   pos + PCI_CAP_LIST_NEXT, cap);
+}
+EXPORT_SYMBOL_GPL(pci_find_next_capability);
+
 static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_type, int cap)
 {
         u16 status;
-        u8 pos, id;
-        int ttl = 48;
+        u8 pos;
 
         pci_bus_read_config_word(bus, devfn, PCI_STATUS, &status);
         if (!(status & PCI_STATUS_CAP_LIST))
@@ -76,24 +103,15 @@ static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_ty
         switch (hdr_type) {
         case PCI_HEADER_TYPE_NORMAL:
         case PCI_HEADER_TYPE_BRIDGE:
-                pci_bus_read_config_byte(bus, devfn, PCI_CAPABILITY_LIST, &pos);
+                pos = PCI_CAPABILITY_LIST;
                 break;
         case PCI_HEADER_TYPE_CARDBUS:
-                pci_bus_read_config_byte(bus, devfn, PCI_CB_CAPABILITY_LIST, &pos);
+                pos = PCI_CB_CAPABILITY_LIST;
                 break;
         default:
                 return 0;
         }
-        while (ttl-- && pos >= 0x40) {
-                pos &= ~3;
-                pci_bus_read_config_byte(bus, devfn, pos + PCI_CAP_LIST_ID, &id);
-                if (id == 0xff)
-                        break;
-                if (id == cap)
-                        return pos;
-                pci_bus_read_config_byte(bus, devfn, pos + PCI_CAP_LIST_NEXT, &pos);
-        }
-        return 0;
+        return __pci_find_next_cap(bus, devfn, pos, cap);
 }
 
 /**
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 5627ce1d2b32..3a4f49f4effb 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -462,11 +462,11 @@ static void __devinit quirk_vt82c686_acpi(struct pci_dev *dev)
 
         pci_read_config_word(dev, 0x70, &hm);
         hm &= PCI_BASE_ADDRESS_IO_MASK;
-        quirk_io_region(dev, hm, 128, PCI_BRIDGE_RESOURCES + 1, "vt82c868 HW-mon");
+        quirk_io_region(dev, hm, 128, PCI_BRIDGE_RESOURCES + 1, "vt82c686 HW-mon");
 
         pci_read_config_dword(dev, 0x90, &smb);
         smb &= PCI_BASE_ADDRESS_IO_MASK;
-        quirk_io_region(dev, smb, 16, PCI_BRIDGE_RESOURCES + 2, "vt82c868 SMB");
+        quirk_io_region(dev, smb, 16, PCI_BRIDGE_RESOURCES + 2, "vt82c686 SMB");
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C686_4,     quirk_vt82c686_acpi );
 
@@ -1243,6 +1243,21 @@ static void __devinit quirk_netmos(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETMOS, PCI_ANY_ID, quirk_netmos);
 
+
+static void __devinit fixup_rev1_53c810(struct pci_dev* dev)
+{
+        /* rev 1 ncr53c810 chips don't set the class at all which means
+         * they don't get their resources remapped. Fix that here.
+         */
+
+        if (dev->class == PCI_CLASS_NOT_DEFINED) {
+                printk(KERN_INFO "NCR 53c810 rev 1 detected, setting PCI class.\n");
+                dev->class = PCI_CLASS_STORAGE_SCSI;
+        }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
+
+
 static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
 {
         while (f < end) {
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index ccf20039e909..309eb557f9a3 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -156,7 +156,7 @@ config TCIC
 
 config PCMCIA_M8XX
         tristate "MPC8xx PCMCIA support"
-        depends on PCMCIA && PPC
+        depends on PCMCIA && PPC && 8xx 
         select PCCARD_NONSTATIC
         help
         Say Y here to include support for PowerPC 8xx series PCMCIA
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index fe37541abbfe..bcecf5133b7e 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_PD6729)				+= pd6729.o
 obj-$(CONFIG_I82365)                            += i82365.o
 obj-$(CONFIG_I82092)                            += i82092.o
 obj-$(CONFIG_TCIC)                              += tcic.o
-obj-$(CONFIG_PCMCIA_M8XX)                              += m8xx_pcmcia.o
+obj-$(CONFIG_PCMCIA_M8XX)                       += m8xx_pcmcia.o
 obj-$(CONFIG_HD64465_PCMCIA)                    += hd64465_ss.o
 obj-$(CONFIG_PCMCIA_SA1100)                     += sa11xx_core.o sa1100_cs.o
 obj-$(CONFIG_PCMCIA_SA1111)                     += sa11xx_core.o sa1111_cs.o
@@ -47,10 +47,10 @@ au1x00_ss-$(CONFIG_MIPS_PB1200)			+= au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_PB1500)                 += au1000_pb1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1000)                 += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1100)                 += au1000_db1x00.o
-au1x00_ss-$(CONFIG_MIPS_DB1200)                 += au1000_db1x00.o
+au1x00_ss-$(CONFIG_MIPS_DB1200)                 += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1500)                 += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1550)                 += au1000_db1x00.o
-au1x00_ss-$(CONFIG_MIPS_XXS1500)               += au1000_xxs1500.o
+au1x00_ss-$(CONFIG_MIPS_XXS1500)                += au1000_xxs1500.o
 
 sa1111_cs-y                                     += sa1111_generic.o
 sa1111_cs-$(CONFIG_ASSABET_NEPONSET)            += sa1100_neponset.o
diff --git a/drivers/pcmcia/au1000_db1x00.c b/drivers/pcmcia/au1000_db1x00.c
index 24cfee1a412c..abc13f28ba3f 100644
--- a/drivers/pcmcia/au1000_db1x00.c
+++ b/drivers/pcmcia/au1000_db1x00.c
@@ -30,6 +30,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h
index b0e7908392a7..f2c970b5f4ff 100644
--- a/drivers/pcmcia/au1000_generic.h
+++ b/drivers/pcmcia/au1000_generic.h
@@ -22,6 +22,8 @@
 #define __ASM_AU1000_PCMCIA_H
 
 /* include the world */
+#include <linux/config.h>
+
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c
index 86c0808d6a05..fd5522ede867 100644
--- a/drivers/pcmcia/au1000_pb1x00.c
+++ b/drivers/pcmcia/au1000_pb1x00.c
@@ -21,6 +21,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  */
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff --git a/drivers/pcmcia/au1000_xxs1500.c b/drivers/pcmcia/au1000_xxs1500.c
index 01a895bc9a47..01874b0bb03b 100644
--- a/drivers/pcmcia/au1000_xxs1500.c
+++ b/drivers/pcmcia/au1000_xxs1500.c
@@ -27,7 +27,6 @@
  */
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index 7ce455d01cc9..4ddd76239b34 100644
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -1366,6 +1366,7 @@ static int __init init_i82365(void)
     if (sockets == 0) {
         printk("not found.\n");
         platform_device_unregister(&i82365_device);
+        release_region(i365_base, 2);
         driver_unregister(&i82365_driver);
         return -ENODEV;
     }
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index f8bed87cf2f1..6d9f71cfcb34 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -39,7 +39,6 @@
 
 #include <asm/io.h>
 #include <asm/bitops.h>
-#include <asm/segment.h>
 #include <asm/system.h>
 
 #include <linux/kernel.h>
@@ -50,6 +49,7 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/platform_device.h>
 
 #include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
@@ -546,29 +546,11 @@ static void m8xx_shutdown(void)
         free_irq(pcmcia_schlvl, NULL);
 }
 
-/* copied from tcic.c */
-
-static int m8xx_drv_suspend(struct device *dev, pm_message_t state, u32 level)
-{
-        int ret = 0;
-        if (level == SUSPEND_SAVE_STATE)
-                ret = pcmcia_socket_dev_suspend(dev, state);
-        return ret;
-}
-
-static int m8xx_drv_resume(struct device *dev, u32 level)
-{
-        int ret = 0;
-        if (level == RESUME_RESTORE_STATE)
-                ret = pcmcia_socket_dev_resume(dev);
-        return ret;
-}
-
 static struct device_driver m8xx_driver = {
         .name = "m8xx-pcmcia",
         .bus = &platform_bus_type,
-        .suspend = m8xx_drv_suspend,
-        .resume = m8xx_drv_resume,
+        .suspend = pcmcia_socket_dev_suspend,
+        .resume = pcmcia_socket_dev_resume,
 };
 
 static struct platform_device m8xx_device = {
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 1c8ad2fcad8a..da8c515743e8 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -8,7 +8,7 @@
  *    Author(s): Original Code written by
  *                        DJ Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
  *               Rewritten by
- *                        Frank Pavlic (pavlic@de.ibm.com) and
+ *                        Frank Pavlic (fpavlic@de.ibm.com) and
  *                        Martin Schwidefsky <schwidefsky@de.ibm.com>
  *
  *    $Revision: 1.99 $  $Date: 2005/05/11 08:10:17 $
@@ -2342,6 +2342,6 @@ __exit lcs_cleanup_module(void)
 module_init(lcs_init_module);
 module_exit(lcs_cleanup_module);
 
-MODULE_AUTHOR("Frank Pavlic <pavlic@de.ibm.com>");
+MODULE_AUTHOR("Frank Pavlic <fpavlic@de.ibm.com>");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index 38a2441564d7..d238c7ed103b 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -8,6 +8,7 @@
 #include <linux/trdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_vlan.h>
+#include <linux/ctype.h>
 
 #include <net/ipv6.h>
 #include <linux/in6.h>
@@ -24,7 +25,7 @@
 
 #include "qeth_mpc.h"
 
-#define VERSION_QETH_H          "$Revision: 1.142 $"
+#define VERSION_QETH_H          "$Revision: 1.152 $"
 
 #ifdef CONFIG_QETH_IPV6
 #define QETH_VERSION_IPV6       ":IPv6"
@@ -718,8 +719,6 @@ struct qeth_reply {
         atomic_t refcnt;
 };
 
-#define QETH_BROADCAST_WITH_ECHO    1
-#define QETH_BROADCAST_WITHOUT_ECHO 2
 
 struct qeth_card_blkt {
         int time_total;
@@ -727,8 +726,10 @@ struct qeth_card_blkt {
         int inter_packet_jumbo;
 };
 
-
-
+#define QETH_BROADCAST_WITH_ECHO    0x01
+#define QETH_BROADCAST_WITHOUT_ECHO 0x02
+#define QETH_LAYER2_MAC_READ        0x01
+#define QETH_LAYER2_MAC_REGISTERED  0x02
 struct qeth_card_info {
         unsigned short unit_addr2;
         unsigned short cula;
@@ -736,7 +737,7 @@ struct qeth_card_info {
         __u16 func_level;
         char mcl_level[QETH_MCL_LENGTH + 1];
         int guestlan;
-        int layer2_mac_registered;
+        int mac_bits;
         int portname_required;
         int portno;
         char portname[9];
@@ -749,6 +750,7 @@ struct qeth_card_info {
         int unique_id;
         struct qeth_card_blkt blkt;
         __u32 csum_mask;
+        enum qeth_ipa_promisc_modes promisc_mode;
 };
 
 struct qeth_card_options {
@@ -775,6 +777,7 @@ struct qeth_card_options {
 enum qeth_threads {
         QETH_SET_IP_THREAD  = 1,
         QETH_RECOVER_THREAD = 2,
+        QETH_SET_PROMISC_MODE_THREAD = 4,
 };
 
 struct qeth_osn_info {
@@ -1074,6 +1077,26 @@ qeth_get_qdio_q_format(struct qeth_card *card)
         }
 }
 
+static inline int
+qeth_isdigit(char * buf)
+{
+        while (*buf) {
+                if (!isdigit(*buf++))
+                        return 0;
+        }
+        return 1;
+}
+
+static inline int
+qeth_isxdigit(char * buf)
+{
+        while (*buf) {
+                if (!isxdigit(*buf++))
+                        return 0;
+        }
+        return 1;
+}
+
 static inline void
 qeth_ipaddr4_to_string(const __u8 *addr, char *buf)
 {
@@ -1090,18 +1113,27 @@ qeth_string_to_ipaddr4(const char *buf, __u8 *addr)
         int i;
 
         start = buf;
-        for (i = 0; i < 3; i++) {
-                if (!(end = strchr(start, '.')))
+        for (i = 0; i < 4; i++) {
+                if (i == 3) {
+                        end = strchr(start,0xa);
+                        if (end)
+                                len = end - start;
+                        else            
+                                len = strlen(start);
+                }
+                else {
+                        end = strchr(start, '.');
+                        len = end - start;
+                }
+                if ((len <= 0) || (len > 3))
                         return -EINVAL;
-                len = end - start;
                 memset(abuf, 0, 4);
                 strncpy(abuf, start, len);
+                if (!qeth_isdigit(abuf))
+                        return -EINVAL;
                 addr[i] = simple_strtoul(abuf, &tmp, 10);
                 start = end + 1;
         }
-        memset(abuf, 0, 4);
-        strcpy(abuf, start);
-        addr[3] = simple_strtoul(abuf, &tmp, 10);
         return 0;
 }
 
@@ -1128,18 +1160,27 @@ qeth_string_to_ipaddr6(const char *buf, __u8 *addr)
 
         tmp_addr = (u16 *)addr;
         start = buf;
-        for (i = 0; i < 7; i++) {
-                if (!(end = strchr(start, ':')))
+        for (i = 0; i < 8; i++) {
+                if (i == 7) {
+                        end = strchr(start,0xa);
+                        if (end)
+                                len = end - start;
+                        else
+                                len = strlen(start);
+                }
+                else {
+                        end = strchr(start, ':');
+                        len = end - start;
+                }
+                if ((len <= 0) || (len > 4))
                         return -EINVAL;
-                len = end - start;
                 memset(abuf, 0, 5);
                 strncpy(abuf, start, len);
+                if (!qeth_isxdigit(abuf))
+                        return -EINVAL;
                 tmp_addr[i] = simple_strtoul(abuf, &tmp, 16);
                 start = end + 1;
         }
-        memset(abuf, 0, 5);
-        strcpy(abuf, start);
-        tmp_addr[7] = simple_strtoul(abuf, &tmp, 16);
         return 0;
 }
 
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 692003c9f896..99cceb242ec4 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/qeth_main.c ($Revision: 1.224 $)
+ * linux/drivers/s390/net/qeth_main.c ($Revision: 1.242 $)
  *
  * Linux on zSeries OSA Express and HiperSockets support
  *
@@ -9,10 +9,10 @@
  *    Author(s): Original Code written by
  *                        Utz Bacher (utz.bacher@de.ibm.com)
  *               Rewritten by
- *                        Frank Pavlic (pavlic@de.ibm.com) and
+ *                        Frank Pavlic (fpavlic@de.ibm.com) and
  *                        Thomas Spatzier <tspat@de.ibm.com>
  *
- *    $Revision: 1.224 $         $Date: 2005/05/04 20:19:18 $
+ *    $Revision: 1.242 $         $Date: 2005/05/04 20:19:18 $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@
 #include "qeth_eddp.h"
 #include "qeth_tso.h"
 
-#define VERSION_QETH_C "$Revision: 1.224 $"
+#define VERSION_QETH_C "$Revision: 1.242 $"
 static const char *version = "qeth S/390 OSA-Express driver";
 
 /**
@@ -160,6 +160,9 @@ static void
 qeth_set_multicast_list(struct net_device *);
 
 static void
+qeth_setadp_promisc_mode(struct qeth_card *);
+
+static void
 qeth_notify_processes(void)
 {
         /*notify all  registered processes */
@@ -602,11 +605,20 @@ __qeth_ref_ip_on_card(struct qeth_card *card, struct qeth_ipaddr *todo,
         int found = 0;
 
         list_for_each_entry(addr, &card->ip_list, entry) {
+                if (card->options.layer2) {
+                        if ((addr->type == todo->type) &&
+                            (memcmp(&addr->mac, &todo->mac, 
+                                    OSA_ADDR_LEN) == 0)) {
+                                found = 1;
+                                break;
+                        }
+                        continue;
+                } 
                 if ((addr->proto     == QETH_PROT_IPV4)  &&
                     (todo->proto     == QETH_PROT_IPV4)  &&
                     (addr->type      == todo->type)      &&
                     (addr->u.a4.addr == todo->u.a4.addr) &&
-                    (addr->u.a4.mask == todo->u.a4.mask)   ){
+                    (addr->u.a4.mask == todo->u.a4.mask)) {
                         found = 1;
                         break;
                 }
@@ -615,12 +627,12 @@ __qeth_ref_ip_on_card(struct qeth_card *card, struct qeth_ipaddr *todo,
                     (addr->type        == todo->type)         &&
                     (addr->u.a6.pfxlen == todo->u.a6.pfxlen)  &&
                     (memcmp(&addr->u.a6.addr, &todo->u.a6.addr,
-                            sizeof(struct in6_addr)) == 0))     {
+                            sizeof(struct in6_addr)) == 0)) {
                         found = 1;
                         break;
                 }
         }
-        if (found){
+        if (found) {
                 addr->users += todo->users;
                 if (addr->users <= 0){
                         *__addr = addr;
@@ -632,7 +644,7 @@ __qeth_ref_ip_on_card(struct qeth_card *card, struct qeth_ipaddr *todo,
                         return 0;
                 }
         }
-        if (todo->users > 0){
+        if (todo->users > 0) {
                 /* for VIPA and RXIP limit refcount to 1 */
                 if (todo->type != QETH_IP_TYPE_NORMAL)
                         todo->users = 1;
@@ -682,12 +694,22 @@ __qeth_insert_ip_todo(struct qeth_card *card, struct qeth_ipaddr *addr, int add)
                 if ((addr->type == QETH_IP_TYPE_DEL_ALL_MC) &&
                     (tmp->type == QETH_IP_TYPE_DEL_ALL_MC))
                         return 0;
+                if (card->options.layer2) {
+                        if ((tmp->type  == addr->type)  &&
+                            (tmp->is_multicast == addr->is_multicast) &&
+                            (memcmp(&tmp->mac, &addr->mac, 
+                                    OSA_ADDR_LEN) == 0)) {
+                                found = 1;
+                                break;
+                        }
+                        continue;
+                }        
                 if ((tmp->proto        == QETH_PROT_IPV4)     &&
                     (addr->proto       == QETH_PROT_IPV4)     &&
                     (tmp->type         == addr->type)         &&
                     (tmp->is_multicast == addr->is_multicast) &&
                     (tmp->u.a4.addr    == addr->u.a4.addr)    &&
-                    (tmp->u.a4.mask    == addr->u.a4.mask)      ){
+                    (tmp->u.a4.mask    == addr->u.a4.mask)) {
                         found = 1;
                         break;
                 }
@@ -697,7 +719,7 @@ __qeth_insert_ip_todo(struct qeth_card *card, struct qeth_ipaddr *addr, int add)
                     (tmp->is_multicast == addr->is_multicast)  &&
                     (tmp->u.a6.pfxlen  == addr->u.a6.pfxlen)   &&
                     (memcmp(&tmp->u.a6.addr, &addr->u.a6.addr,
-                            sizeof(struct in6_addr)) == 0)        ){
+                            sizeof(struct in6_addr)) == 0)) {
                         found = 1;
                         break;
                 }
@@ -707,7 +729,7 @@ __qeth_insert_ip_todo(struct qeth_card *card, struct qeth_ipaddr *addr, int add)
                         tmp->users += addr->users;
                 else
                         tmp->users += add? 1:-1;
-                if (tmp->users == 0){
+                if (tmp->users == 0) {
                         list_del(&tmp->entry);
                         kfree(tmp);
                 }
@@ -738,12 +760,15 @@ qeth_delete_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
         unsigned long flags;
         int rc = 0;
 
-        QETH_DBF_TEXT(trace,4,"delip");
-        if (addr->proto == QETH_PROT_IPV4)
-                QETH_DBF_HEX(trace,4,&addr->u.a4.addr,4);
+        QETH_DBF_TEXT(trace, 4, "delip");
+
+        if (card->options.layer2)
+                QETH_DBF_HEX(trace, 4, &addr->mac, 6);
+        else if (addr->proto == QETH_PROT_IPV4)
+                QETH_DBF_HEX(trace, 4, &addr->u.a4.addr, 4);
         else {
-                QETH_DBF_HEX(trace,4,&addr->u.a6.addr,8);
-                QETH_DBF_HEX(trace,4,((char *)&addr->u.a6.addr)+8,8);
+                QETH_DBF_HEX(trace, 4, &addr->u.a6.addr, 8);
+                QETH_DBF_HEX(trace, 4, ((char *)&addr->u.a6.addr) + 8, 8);
         }
         spin_lock_irqsave(&card->ip_lock, flags);
         rc = __qeth_insert_ip_todo(card, addr, 0);
@@ -757,12 +782,14 @@ qeth_add_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
         unsigned long flags;
         int rc = 0;
 
-        QETH_DBF_TEXT(trace,4,"addip");
-        if (addr->proto == QETH_PROT_IPV4)
-                QETH_DBF_HEX(trace,4,&addr->u.a4.addr,4);
+        QETH_DBF_TEXT(trace, 4, "addip");
+        if (card->options.layer2)
+                QETH_DBF_HEX(trace, 4, &addr->mac, 6);
+        else if (addr->proto == QETH_PROT_IPV4)
+                QETH_DBF_HEX(trace, 4, &addr->u.a4.addr, 4);
         else {
-                QETH_DBF_HEX(trace,4,&addr->u.a6.addr,8);
-                QETH_DBF_HEX(trace,4,((char *)&addr->u.a6.addr)+8,8);
+                QETH_DBF_HEX(trace, 4, &addr->u.a6.addr, 8);
+                QETH_DBF_HEX(trace, 4, ((char *)&addr->u.a6.addr) + 8, 8);
         }
         spin_lock_irqsave(&card->ip_lock, flags);
         rc = __qeth_insert_ip_todo(card, addr, 1);
@@ -775,7 +802,7 @@ __qeth_delete_all_mc(struct qeth_card *card, unsigned long *flags)
 {
         struct qeth_ipaddr *addr, *tmp;
         int rc;
-
+again:
         list_for_each_entry_safe(addr, tmp, &card->ip_list, entry) {
                 if (addr->is_multicast) {
                         spin_unlock_irqrestore(&card->ip_lock, *flags);
@@ -784,6 +811,7 @@ __qeth_delete_all_mc(struct qeth_card *card, unsigned long *flags)
                         if (!rc) {
                                 list_del(&addr->entry);
                                 kfree(addr);
+                                goto again;
                         }
                 }
         }
@@ -851,6 +879,7 @@ qeth_set_ip_addr_list(struct qeth_card *card)
 
 static void qeth_delete_mc_addresses(struct qeth_card *);
 static void qeth_add_multicast_ipv4(struct qeth_card *);
+static void qeth_layer2_add_multicast(struct qeth_card *);
 #ifdef CONFIG_QETH_IPV6
 static void qeth_add_multicast_ipv6(struct qeth_card *);
 #endif
@@ -939,6 +968,24 @@ qeth_register_ip_addresses(void *ptr)
         return 0;
 }
 
+/*
+ * Drive the SET_PROMISC_MODE thread
+ */
+static int
+qeth_set_promisc_mode(void *ptr)
+{
+        struct qeth_card *card = (struct qeth_card *) ptr;
+
+        daemonize("qeth_setprm");
+        QETH_DBF_TEXT(trace,4,"setprm1");
+        if (!qeth_do_run_thread(card, QETH_SET_PROMISC_MODE_THREAD))
+                return 0;
+        QETH_DBF_TEXT(trace,4,"setprm2");
+        qeth_setadp_promisc_mode(card);
+        qeth_clear_thread_running_bit(card, QETH_SET_PROMISC_MODE_THREAD);
+        return 0;
+}
+
 static int
 qeth_recover(void *ptr)
 {
@@ -1005,6 +1052,8 @@ qeth_start_kernel_thread(struct qeth_card *card)
 
         if (qeth_do_start_thread(card, QETH_SET_IP_THREAD))
                 kernel_thread(qeth_register_ip_addresses, (void *)card,SIGCHLD);
+        if (qeth_do_start_thread(card, QETH_SET_PROMISC_MODE_THREAD))
+                kernel_thread(qeth_set_promisc_mode, (void *)card, SIGCHLD);
         if (qeth_do_start_thread(card, QETH_RECOVER_THREAD))
                 kernel_thread(qeth_recover, (void *) card, SIGCHLD);
 }
@@ -3749,7 +3798,7 @@ qeth_open(struct net_device *dev)
 
         if ( (card->info.type != QETH_CARD_TYPE_OSN) &&
              (card->options.layer2) &&
-             (!card->info.layer2_mac_registered)) {
+             (!(card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))) {
                 QETH_DBF_TEXT(trace,4,"nomacadr");
                 return -EPERM;
         }
@@ -4311,6 +4360,8 @@ qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,
 out:
         if (flush_count)
                 qeth_flush_buffers(queue, 0, start_index, flush_count);
+        else if (!atomic_read(&queue->set_pci_flags_count))
+                atomic_swap(&queue->state, QETH_OUT_Q_LOCKED_FLUSH);
         /*
          * queue->state will go from LOCKED -> UNLOCKED or from
          * LOCKED_FLUSH -> LOCKED if output_handler wanted to 'notify' us
@@ -4975,6 +5026,10 @@ qeth_default_setassparms_cb(struct qeth_card *, struct qeth_reply *,
                             unsigned long);
 
 static int
+qeth_default_setadapterparms_cb(struct qeth_card *card,
+                                struct qeth_reply *reply,
+                                unsigned long data);
+static int
 qeth_send_setassparms(struct qeth_card *, struct qeth_cmd_buffer *,
                       __u16, long,
                       int (*reply_cb)
@@ -5301,8 +5356,7 @@ qeth_free_vlan_addresses4(struct qeth_card *card, unsigned short vid)
         struct qeth_ipaddr *addr;
 
         QETH_DBF_TEXT(trace, 4, "frvaddr4");
-        if (!card->vlangrp)
-                return;
+
         rcu_read_lock();
         in_dev = __in_dev_get_rcu(card->vlangrp->vlan_devices[vid]);
         if (!in_dev)
@@ -5330,8 +5384,7 @@ qeth_free_vlan_addresses6(struct qeth_card *card, unsigned short vid)
         struct qeth_ipaddr *addr;
 
         QETH_DBF_TEXT(trace, 4, "frvaddr6");
-        if (!card->vlangrp)
-                return;
+
         in6_dev = in6_dev_get(card->vlangrp->vlan_devices[vid]);
         if (!in6_dev)
                 return;
@@ -5351,10 +5404,38 @@ qeth_free_vlan_addresses6(struct qeth_card *card, unsigned short vid)
 }
 
 static void
+qeth_free_vlan_addresses(struct qeth_card *card, unsigned short vid)
+{
+        if (card->options.layer2 || !card->vlangrp)
+                return;
+        qeth_free_vlan_addresses4(card, vid);
+        qeth_free_vlan_addresses6(card, vid);
+}
+
+static int
+qeth_layer2_send_setdelvlan_cb(struct qeth_card *card,
+                               struct qeth_reply *reply,
+                               unsigned long data)
+{
+        struct qeth_ipa_cmd *cmd;
+
+        QETH_DBF_TEXT(trace, 2, "L2sdvcb");
+        cmd = (struct qeth_ipa_cmd *) data;
+        if (cmd->hdr.return_code) {
+                PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. "
+                          "Continuing\n",cmd->data.setdelvlan.vlan_id, 
+                          QETH_CARD_IFNAME(card), cmd->hdr.return_code);
+                QETH_DBF_TEXT_(trace, 2, "L2VL%4x", cmd->hdr.command);
+                QETH_DBF_TEXT_(trace, 2, "L2%s", CARD_BUS_ID(card));
+                QETH_DBF_TEXT_(trace, 2, "err%d", cmd->hdr.return_code);
+        }
+        return 0;
+}
+
+static int
 qeth_layer2_send_setdelvlan(struct qeth_card *card, __u16 i,
                             enum qeth_ipa_cmds ipacmd)
 {
-        int rc;
         struct qeth_ipa_cmd *cmd;
         struct qeth_cmd_buffer *iob;
 
@@ -5362,15 +5443,8 @@ qeth_layer2_send_setdelvlan(struct qeth_card *card, __u16 i,
         iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);
         cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
         cmd->data.setdelvlan.vlan_id = i;
-
-        rc = qeth_send_ipa_cmd(card, iob, NULL, NULL);
-        if (rc) {
-                PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. "
-                          "Continuing\n",i, QETH_CARD_IFNAME(card), rc);
-                QETH_DBF_TEXT_(trace, 2, "L2VL%4x", ipacmd);
-                QETH_DBF_TEXT_(trace, 2, "L2%s", CARD_BUS_ID(card));
-                QETH_DBF_TEXT_(trace, 2, "err%d", rc);
-        }
+        return qeth_send_ipa_cmd(card, iob, 
+                                 qeth_layer2_send_setdelvlan_cb, NULL);
 }
 
 static void
@@ -5420,8 +5494,7 @@ qeth_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
         qeth_free_vlan_skbs(card, vid);
         spin_lock_irqsave(&card->vlanlock, flags);
         /* unregister IP addresses of vlan device */
-        qeth_free_vlan_addresses4(card, vid);
-        qeth_free_vlan_addresses6(card, vid);
+        qeth_free_vlan_addresses(card, vid);
         if (card->vlangrp)
                 card->vlangrp->vlan_devices[vid] = NULL;
         spin_unlock_irqrestore(&card->vlanlock, flags);
@@ -5430,6 +5503,59 @@ qeth_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
         qeth_set_multicast_list(card->dev);
 }
 #endif
+/**
+ * Examine hardware response to SET_PROMISC_MODE
+ */
+static int
+qeth_setadp_promisc_mode_cb(struct qeth_card *card, 
+                            struct qeth_reply *reply,
+                            unsigned long data)
+{
+        struct qeth_ipa_cmd *cmd;
+        struct qeth_ipacmd_setadpparms *setparms;
+
+        QETH_DBF_TEXT(trace,4,"prmadpcb");
+
+        cmd = (struct qeth_ipa_cmd *) data;
+        setparms = &(cmd->data.setadapterparms);
+        
+        qeth_default_setadapterparms_cb(card, reply, (unsigned long)cmd);
+        if (cmd->hdr.return_code) { 
+                QETH_DBF_TEXT_(trace,4,"prmrc%2.2x",cmd->hdr.return_code);      
+                setparms->data.mode = SET_PROMISC_MODE_OFF;
+        }
+        card->info.promisc_mode = setparms->data.mode;
+        return 0;
+}
+/*
+ * Set promiscuous mode (on or off) (SET_PROMISC_MODE command)
+ */
+static void
+qeth_setadp_promisc_mode(struct qeth_card *card)
+{
+        enum qeth_ipa_promisc_modes mode;
+        struct net_device *dev = card->dev;
+        struct qeth_cmd_buffer *iob;
+        struct qeth_ipa_cmd *cmd;
+
+        QETH_DBF_TEXT(trace, 4, "setprom");
+
+        if (((dev->flags & IFF_PROMISC) &&
+             (card->info.promisc_mode == SET_PROMISC_MODE_ON)) ||
+            (!(dev->flags & IFF_PROMISC) &&
+             (card->info.promisc_mode == SET_PROMISC_MODE_OFF)))
+                return;
+        mode = SET_PROMISC_MODE_OFF;
+        if (dev->flags & IFF_PROMISC)
+                mode = SET_PROMISC_MODE_ON;
+        QETH_DBF_TEXT_(trace, 4, "mode:%x", mode);
+
+        iob = qeth_get_adapter_cmd(card, IPA_SETADP_SET_PROMISC_MODE,
+                        sizeof(struct qeth_ipacmd_setadpparms));
+        cmd = (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE);
+        cmd->data.setadapterparms.data.mode = mode;
+        qeth_send_ipa_cmd(card, iob, qeth_setadp_promisc_mode_cb, NULL);
+}
 
 /**
  * set multicast address on card
@@ -5444,12 +5570,22 @@ qeth_set_multicast_list(struct net_device *dev)
          
         QETH_DBF_TEXT(trace,3,"setmulti");
         qeth_delete_mc_addresses(card);
+        if (card->options.layer2) {
+                qeth_layer2_add_multicast(card);
+                goto out;
+        }
         qeth_add_multicast_ipv4(card);
 #ifdef CONFIG_QETH_IPV6
         qeth_add_multicast_ipv6(card);
 #endif
+out:
         if (qeth_set_thread_start_bit(card, QETH_SET_IP_THREAD) == 0)
                 schedule_work(&card->kernel_thread_starter);
+        if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))
+                return;
+        if (qeth_set_thread_start_bit(card, QETH_SET_PROMISC_MODE_THREAD)==0)
+                schedule_work(&card->kernel_thread_starter);
+
 }
 
 static int
@@ -5657,6 +5793,24 @@ qeth_add_multicast_ipv4(struct qeth_card *card)
         in_dev_put(in4_dev);
 }
 
+static void
+qeth_layer2_add_multicast(struct qeth_card *card)
+{
+        struct qeth_ipaddr *ipm;
+        struct dev_mc_list *dm;
+
+        QETH_DBF_TEXT(trace,4,"L2addmc");
+        for (dm = card->dev->mc_list; dm; dm = dm->next) {
+                ipm = qeth_get_addr_buffer(QETH_PROT_IPV4);
+                if (!ipm)
+                        continue;
+                memcpy(ipm->mac,dm->dmi_addr,MAX_ADDR_LEN);
+                ipm->is_multicast = 1;
+                if (!qeth_add_ip(card, ipm))
+                        kfree(ipm);
+        }
+}
+
 #ifdef CONFIG_QETH_IPV6
 static inline void
 qeth_add_mc6(struct qeth_card *card, struct inet6_dev *in6_dev)
@@ -5825,10 +5979,10 @@ qeth_layer2_send_setmac_cb(struct qeth_card *card,
                 PRINT_WARN("Error in registering MAC address on " \
                            "device %s: x%x\n", CARD_BUS_ID(card),
                            cmd->hdr.return_code);
-                card->info.layer2_mac_registered = 0;
+                card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;
                 cmd->hdr.return_code = -EIO;
         } else {
-                card->info.layer2_mac_registered = 1;
+                card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;
                 memcpy(card->dev->dev_addr,cmd->data.setdelmac.mac,
                        OSA_ADDR_LEN);
                 PRINT_INFO("MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
@@ -5866,7 +6020,7 @@ qeth_layer2_send_delmac_cb(struct qeth_card *card,
                 cmd->hdr.return_code = -EIO;
                 return 0;
         }
-        card->info.layer2_mac_registered = 0;
+        card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;
 
         return 0;
 }
@@ -5874,7 +6028,7 @@ static int
 qeth_layer2_send_delmac(struct qeth_card *card, __u8 *mac)
 {
         QETH_DBF_TEXT(trace, 2, "L2Delmac");
-        if (!card->info.layer2_mac_registered)
+        if (!(card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))
                 return 0;
         return qeth_layer2_send_setdelmac(card, mac, IPA_CMD_DELVMAC,
                                           qeth_layer2_send_delmac_cb);
@@ -5896,7 +6050,7 @@ qeth_layer2_set_mac_address(struct net_device *dev, void *p)
         card = (struct qeth_card *) dev->priv;
 
         if (!card->options.layer2) {
-                PRINT_WARN("Setting MAC address on %s is not supported"
+                PRINT_WARN("Setting MAC address on %s is not supported "
                            "in Layer 3 mode.\n", dev->name);
                 QETH_DBF_TEXT(trace, 3, "setmcLY3");
                 return -EOPNOTSUPP;
@@ -6441,6 +6595,8 @@ qeth_default_setadapterparms_cb(struct qeth_card *card,
         return 0;
 }
 
+
+
 static int
 qeth_query_setadapterparms_cb(struct qeth_card *card, struct qeth_reply *reply,
                               unsigned long data)
@@ -6481,8 +6637,13 @@ qeth_setadpparms_change_macaddr_cb(struct qeth_card *card,
         QETH_DBF_TEXT(trace,4,"chgmaccb");
 
         cmd = (struct qeth_ipa_cmd *) data;
-        memcpy(card->dev->dev_addr,
-               &cmd->data.setadapterparms.data.change_addr.addr,OSA_ADDR_LEN);
+        if (!card->options.layer2 || card->info.guestlan ||
+            !(card->info.mac_bits & QETH_LAYER2_MAC_READ)) {    
+                memcpy(card->dev->dev_addr,
+                       &cmd->data.setadapterparms.data.change_addr.addr,
+                       OSA_ADDR_LEN);
+                card->info.mac_bits |= QETH_LAYER2_MAC_READ;
+        }
         qeth_default_setadapterparms_cb(card, reply, (unsigned long) cmd);
         return 0;
 }
@@ -6602,6 +6763,12 @@ qeth_layer2_initialize(struct qeth_card *card)
         QETH_DBF_TEXT(setup, 2, "doL2init");
         QETH_DBF_TEXT_(setup, 2, "doL2%s", CARD_BUS_ID(card));
 
+        rc = qeth_query_setadapterparms(card);
+        if (rc) {
+                PRINT_WARN("could not query adapter parameters on device %s: "
+                           "x%x\n", CARD_BUS_ID(card), rc);
+        }
+
         rc = qeth_setadpparms_change_macaddr(card);
         if (rc) {
                 PRINT_WARN("couldn't get MAC address on "
@@ -8548,7 +8715,7 @@ EXPORT_SYMBOL(qeth_osn_deregister);
 EXPORT_SYMBOL(qeth_osn_assist);
 module_init(qeth_init);
 module_exit(qeth_exit);
-MODULE_AUTHOR("Frank Pavlic <pavlic@de.ibm.com>");
+MODULE_AUTHOR("Frank Pavlic <fpavlic@de.ibm.com>");
 MODULE_DESCRIPTION("Linux on zSeries OSA Express and HiperSockets support\n" \
                                       "Copyright 2000,2003 IBM Corporation\n");
 
diff --git a/drivers/s390/net/qeth_mpc.c b/drivers/s390/net/qeth_mpc.c
index 30e053d3cac2..f0a080a9e515 100644
--- a/drivers/s390/net/qeth_mpc.c
+++ b/drivers/s390/net/qeth_mpc.c
@@ -4,7 +4,7 @@
  * Linux on zSeries OSA Express and HiperSockets support
  *
  * Copyright 2000,2003 IBM Corporation
- * Author(s): Frank Pavlic <pavlic@de.ibm.com>
+ * Author(s): Frank Pavlic <fpavlic@de.ibm.com>
  *            Thomas Spatzier <tspat@de.ibm.com>
  *
  */
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h
index 7edc5f1fc0d2..5f71486e708c 100644
--- a/drivers/s390/net/qeth_mpc.h
+++ b/drivers/s390/net/qeth_mpc.h
@@ -6,7 +6,7 @@
  * Copyright 2000,2003 IBM Corporation
  * Author(s): Utz Bacher <utz.bacher@de.ibm.com>
  *            Thomas Spatzier <tspat@de.ibm.com>
- *            Frank Pavlic <pavlic@de.ibm.com>
+ *            Frank Pavlic <fpavlic@de.ibm.com>
  *
  */
 #ifndef __QETH_MPC_H__
@@ -14,7 +14,7 @@
 
 #include <asm/qeth.h>
 
-#define VERSION_QETH_MPC_H "$Revision: 1.43 $"
+#define VERSION_QETH_MPC_H "$Revision: 1.44 $"
 
 extern const char *VERSION_QETH_MPC_C;
 
@@ -217,7 +217,7 @@ enum qeth_ipa_setadp_cmd {
         IPA_SETADP_SEND_OSA_MESSAGE             = 0x0100,
         IPA_SETADP_SET_SNMP_CONTROL             = 0x0200,
         IPA_SETADP_READ_SNMP_PARMS              = 0x0400,
-        IPA_SETADP_WRITE_SNMP_PARMS             = 0x0800,
+        IPA_SETADP_SET_PROMISC_MODE             = 0x0800,
         IPA_SETADP_QUERY_CARD_INFO              = 0x1000,
 };
 enum qeth_ipa_mac_ops {
@@ -232,9 +232,12 @@ enum qeth_ipa_addr_ops {
         CHANGE_ADDR_ADD_ADDR            = 1,
         CHANGE_ADDR_DEL_ADDR            = 2,
         CHANGE_ADDR_FLUSH_ADDR_TABLE    = 4,
-
-
 };
+enum qeth_ipa_promisc_modes {
+        SET_PROMISC_MODE_OFF            = 0,
+        SET_PROMISC_MODE_ON             = 1,
+};
+
 /* (SET)DELIP(M) IPA stuff ***************************************************/
 struct qeth_ipacmd_setdelip4 {
         __u8   ip_addr[4];
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index f91a02db5743..ddd6019ba092 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.55 $)
+ * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.58 $)
  *
  * Linux on zSeries OSA Express and HiperSockets support
  * This file contains code related to sysfs.
@@ -8,7 +8,7 @@
  * Copyright 2000,2003 IBM Corporation
  *
  * Author(s): Thomas Spatzier <tspat@de.ibm.com>
- *            Frank Pavlic <pavlic@de.ibm.com>
+ *            Frank Pavlic <fpavlic@de.ibm.com>
  *
  */
 #include <linux/list.h>
@@ -20,7 +20,7 @@
 #include "qeth_mpc.h"
 #include "qeth_fs.h"
 
-const char *VERSION_QETH_SYS_C = "$Revision: 1.55 $";
+const char *VERSION_QETH_SYS_C = "$Revision: 1.58 $";
 
 /*****************************************************************************/
 /*                                                                           */
@@ -1117,7 +1117,7 @@ qeth_parse_ipatoe(const char* buf, enum qeth_prot_versions proto,
         start = buf;
         /* get address string */
         end = strchr(start, '/');
-        if (!end){
+        if (!end || (end-start >= 49)){
                 PRINT_WARN("Invalid format for ipato_addx/delx. "
                            "Use <ip addr>/<mask bits>\n");
                 return -EINVAL;
diff --git a/drivers/s390/net/qeth_tso.h b/drivers/s390/net/qeth_tso.h
index ad33e6f466f1..e245af3c4cbd 100644
--- a/drivers/s390/net/qeth_tso.h
+++ b/drivers/s390/net/qeth_tso.h
@@ -5,7 +5,7 @@
  *
  * Copyright 2004 IBM Corporation
  *
- *    Author(s): Frank Pavlic <pavlic@de.ibm.com>
+ *    Author(s): Frank Pavlic <fpavlic@de.ibm.com>
  *
  *    $Revision: 1.7 $   $Date: 2005/05/04 20:19:18 $
  *
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 2c86a4b809cd..c3a51d1fae5d 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -119,7 +119,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         __u8 regs = readb(d7s_regs);
         __u8 ireg = 0;
-        int error = 0
+        int error = 0;
 
         if (D7S_MINOR != iminor(file->f_dentry->d_inode))
                 return -ENODEV;
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 10c470e7d316..57ef7ae387d9 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -255,7 +255,7 @@ static struct ata_port_info ahci_port_info[] = {
         },
 };
 
-static struct pci_device_id ahci_pci_tbl[] = {
+static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VENDOR_ID_INTEL, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_ahci }, /* ICH6 */
         { PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index a1bd8d95623c..855428ff37e9 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -95,7 +95,7 @@ static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
 
 static unsigned int in_module_init = 1;
 
-static struct pci_device_id piix_pci_tbl[] = {
+static const struct pci_device_id piix_pci_tbl[] = {
 #ifdef ATA_ENABLE_PATA
         { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix4_pata },
         { 0x8086, 0x24db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index a74b4071a662..e51d9a8a2796 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -4563,6 +4563,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
 
         probe_ent->irq = pdev->irq;
         probe_ent->irq_flags = SA_SHIRQ;
+        probe_ent->private_data = port[0]->private_data;
 
         if (ports & ATA_PORT_PRIMARY) {
                 probe_ent->port[p].cmd_addr = pci_resource_start(pdev, 0);
@@ -4599,6 +4600,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, stru
         probe_ent->legacy_mode = 1;
         probe_ent->n_ports = 1;
         probe_ent->hard_port_no = port_num;
+        probe_ent->private_data = port->private_data;
 
         switch(port_num)
         {
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index bb30fcdc9297..7e37f488f591 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -1129,6 +1129,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm
                  * length 0 means transfer 0 block of data.
                  * However, for ATA R/W commands, sector count 0 means
                  * 256 or 65536 sectors, not 0 sectors as in SCSI.
+                 *
+                 * WARNING: one or two older ATA drives treat 0 as 0...
                  */
                 goto nothing_to_do;
 
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index c90723860a04..07498118359d 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1704,7 +1704,6 @@ MODULE_DEVICE_TABLE(pci, lpfc_id_table);
 
 static struct pci_driver lpfc_driver = {
         .name           = LPFC_DRIVER_NAME,
-        .owner          = THIS_MODULE,
         .id_table       = lpfc_id_table,
         .probe          = lpfc_pci_probe_one,
         .remove         = __devexit_p(lpfc_pci_remove_one),
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index 78b4ff117af6..f557f17ca00c 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -190,7 +190,7 @@ static struct ata_port_info adma_port_info[] = {
         },
 };
 
-static struct pci_device_id adma_ata_pci_tbl[] = {
+static const struct pci_device_id adma_ata_pci_tbl[] = {
         { PCI_VENDOR_ID_PDC, 0x1841, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_1841_idx },
 
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 93d55233af7b..257c128f4aaa 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -349,7 +349,7 @@ static struct ata_port_info mv_port_info[] = {
         },
 };
 
-static struct pci_device_id mv_pci_tbl[] = {
+static const struct pci_device_id mv_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5040), 0, 0, chip_504x},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5041), 0, 0, chip_504x},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5080), 0, 0, chip_508x},
@@ -359,6 +359,8 @@ static struct pci_device_id mv_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6041), 0, 0, chip_604x},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6080), 0, 0, chip_608x},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6081), 0, 0, chip_608x},
+
+        {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x0241), 0, 0, chip_604x},
         {}                      /* terminate list */
 };
 
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 37a4fae95ed4..4954896dfdb9 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -137,7 +137,7 @@ enum nv_host_type
         CK804
 };
 
-static struct pci_device_id nv_pci_tbl[] = {
+static const struct pci_device_id nv_pci_tbl[] = {
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0, NFORCE2 },
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 9edc9d91efc3..242d906987ad 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -193,7 +193,7 @@ static struct ata_port_info pdc_port_info[] = {
         },
 };
 
-static struct pci_device_id pdc_ata_pci_tbl[] = {
+static const struct pci_device_id pdc_ata_pci_tbl[] = {
         { PCI_VENDOR_ID_PROMISE, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_2037x },
         { PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index d274ab235781..b2f6324a2eb2 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -184,7 +184,7 @@ static struct ata_port_info qs_port_info[] = {
         },
 };
 
-static struct pci_device_id qs_ata_pci_tbl[] = {
+static const struct pci_device_id qs_ata_pci_tbl[] = {
         { PCI_VENDOR_ID_PDC, 0x2068, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_2068_idx },
 
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index d0e3c3c6c25f..36091868560d 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -87,7 +87,7 @@ static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static void sil_post_set_mode (struct ata_port *ap);
 
 
-static struct pci_device_id sil_pci_tbl[] = {
+static const struct pci_device_id sil_pci_tbl[] = {
         { 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
         { 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
         { 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 4682a50650b4..d3198d9a72c1 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -240,7 +240,7 @@ static void sil24_port_stop(struct ata_port *ap);
 static void sil24_host_stop(struct ata_host_set *host_set);
 static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
 
-static struct pci_device_id sil24_pci_tbl[] = {
+static const struct pci_device_id sil24_pci_tbl[] = {
         { 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 },
         { 0x1095, 0x3132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3132 },
         { 0x1095, 0x3131, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3131 },
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index 42d7c4e92501..32e12620b162 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -67,7 +67,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
 static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 
-static struct pci_device_id sis_pci_tbl[] = {
+static const struct pci_device_id sis_pci_tbl[] = {
         { PCI_VENDOR_ID_SI, 0x180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 },
         { PCI_VENDOR_ID_SI, 0x181, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 },
         { PCI_VENDOR_ID_SI, 0x182, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 },
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 9895d1caefcf..57e5a9d964c3 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -466,7 +466,7 @@ err_out:
  * 0x24a is device ID for BCM5785 (aka HT1000) HT southbridge integrated SATA
  * controller
  * */
-static struct pci_device_id k2_sata_pci_tbl[] = {
+static const struct pci_device_id k2_sata_pci_tbl[] = {
         { 0x1166, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
         { 0x1166, 0x0241, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
         { 0x1166, 0x0242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index d5a38784352b..b4bbe48acab0 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -229,7 +229,7 @@ static struct ata_port_info pdc_port_info[] = {
 
 };
 
-static struct pci_device_id pdc_sata_pci_tbl[] = {
+static const struct pci_device_id pdc_sata_pci_tbl[] = {
         { PCI_VENDOR_ID_PROMISE, 0x6622, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_20621 },
         { }     /* terminate list */
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index cf0baaa4e045..b2422a0f25c8 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -55,7 +55,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
 static u32 uli_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void uli_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 
-static struct pci_device_id uli_pci_tbl[] = {
+static const struct pci_device_id uli_pci_tbl[] = {
         { PCI_VENDOR_ID_AL, 0x5289, PCI_ANY_ID, PCI_ANY_ID, 0, 0, uli_5289 },
         { PCI_VENDOR_ID_AL, 0x5287, PCI_ANY_ID, PCI_ANY_ID, 0, 0, uli_5287 },
         { PCI_VENDOR_ID_AL, 0x5281, PCI_ANY_ID, PCI_ANY_ID, 0, 0, uli_5281 },
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index ab19d2ba2a4b..c76215692da2 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -75,7 +75,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 
-static struct pci_device_id svia_pci_tbl[] = {
+static const struct pci_device_id svia_pci_tbl[] = {
         { 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
         { 0x1106, 0x3249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6421 },
 
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index ce8a2fd7da84..77a6e4b9262d 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -400,7 +400,7 @@ err_out:
  * 0x8086/0x3200 is the Intel 31244, which is supposed to be identical
  * compatibility is untested as of yet
  */
-static struct pci_device_id vsc_sata_pci_tbl[] = {
+static const struct pci_device_id vsc_sata_pci_tbl[] = {
         { 0x1725, 0x7174, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
         { 0x8086, 0x3200, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
         { }
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 98820603e75f..3742753241ee 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2381,9 +2381,9 @@ void serial8250_resume_port(int line)
  * list is terminated with a zero flags entry, which means we expect
  * all entries to have at least UPF_BOOT_AUTOCONF set.
  */
-static int __devinit serial8250_probe(struct device *dev)
+static int __devinit serial8250_probe(struct platform_device *dev)
 {
-        struct plat_serial8250_port *p = dev->platform_data;
+        struct plat_serial8250_port *p = dev->dev.platform_data;
         struct uart_port port;
         int ret, i;
 
@@ -2399,12 +2399,12 @@ static int __devinit serial8250_probe(struct device *dev)
                 port.flags      = p->flags;
                 port.mapbase    = p->mapbase;
                 port.hub6       = p->hub6;
-                port.dev        = dev;
+                port.dev        = &dev->dev;
                 if (share_irqs)
                         port.flags |= UPF_SHARE_IRQ;
                 ret = serial8250_register_port(&port);
                 if (ret < 0) {
-                        dev_err(dev, "unable to register port at index %d "
+                        dev_err(&dev->dev, "unable to register port at index %d "
                                 "(IO%lx MEM%lx IRQ%d): %d\n", i,
                                 p->iobase, p->mapbase, p->irq, ret);
                 }
@@ -2415,54 +2415,55 @@ static int __devinit serial8250_probe(struct device *dev)
 /*
  * Remove serial ports registered against a platform device.
  */
-static int __devexit serial8250_remove(struct device *dev)
+static int __devexit serial8250_remove(struct platform_device *dev)
 {
         int i;
 
         for (i = 0; i < UART_NR; i++) {
                 struct uart_8250_port *up = &serial8250_ports[i];
 
-                if (up->port.dev == dev)
+                if (up->port.dev == &dev->dev)
                         serial8250_unregister_port(i);
         }
         return 0;
 }
 
-static int serial8250_suspend(struct device *dev, pm_message_t state)
+static int serial8250_suspend(struct platform_device *dev, pm_message_t state)
 {
         int i;
 
         for (i = 0; i < UART_NR; i++) {
                 struct uart_8250_port *up = &serial8250_ports[i];
 
-                if (up->port.type != PORT_UNKNOWN && up->port.dev == dev)
+                if (up->port.type != PORT_UNKNOWN && up->port.dev == &dev->dev)
                         uart_suspend_port(&serial8250_reg, &up->port);
         }
 
         return 0;
 }
 
-static int serial8250_resume(struct device *dev)
+static int serial8250_resume(struct platform_device *dev)
 {
         int i;
 
         for (i = 0; i < UART_NR; i++) {
                 struct uart_8250_port *up = &serial8250_ports[i];
 
-                if (up->port.type != PORT_UNKNOWN && up->port.dev == dev)
+                if (up->port.type != PORT_UNKNOWN && up->port.dev == &dev->dev)
                         uart_resume_port(&serial8250_reg, &up->port);
         }
 
         return 0;
 }
 
-static struct device_driver serial8250_isa_driver = {
-        .name           = "serial8250",
-        .bus            = &platform_bus_type,
+static struct platform_driver serial8250_isa_driver = {
         .probe          = serial8250_probe,
         .remove         = __devexit_p(serial8250_remove),
         .suspend        = serial8250_suspend,
         .resume         = serial8250_resume,
+        .driver         = {
+                .name   = "serial8250",
+        },
 };
 
 /*
@@ -2608,7 +2609,7 @@ static int __init serial8250_init(void)
 
         serial8250_register_ports(&serial8250_reg, &serial8250_isa_devs->dev);
 
-        ret = driver_register(&serial8250_isa_driver);
+        ret = platform_driver_register(&serial8250_isa_driver);
         if (ret == 0)
                 goto out;
 
@@ -2630,7 +2631,7 @@ static void __exit serial8250_exit(void)
          */
         serial8250_isa_devs = NULL;
 
-        driver_unregister(&serial8250_isa_driver);
+        platform_driver_unregister(&serial8250_isa_driver);
         platform_device_unregister(isa_dev);
 
         uart_unregister_driver(&serial8250_reg);
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 4a54ff584700..355cd93a8a87 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -921,9 +921,9 @@ static struct uart_driver imx_reg = {
         .cons           = IMX_CONSOLE,
 };
 
-static int serial_imx_suspend(struct device *_dev, pm_message_t state)
+static int serial_imx_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct imx_port *sport = dev_get_drvdata(_dev);
+        struct imx_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_suspend_port(&imx_reg, &sport->port);
@@ -931,9 +931,9 @@ static int serial_imx_suspend(struct device *_dev, pm_message_t state)
         return 0;
 }
 
-static int serial_imx_resume(struct device *_dev)
+static int serial_imx_resume(struct platform_device *dev)
 {
-        struct imx_port *sport = dev_get_drvdata(_dev);
+        struct imx_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_resume_port(&imx_reg, &sport->port);
@@ -941,21 +941,19 @@ static int serial_imx_resume(struct device *_dev)
         return 0;
 }
 
-static int serial_imx_probe(struct device *_dev)
+static int serial_imx_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
-
-        imx_ports[dev->id].port.dev = _dev;
+        imx_ports[dev->id].port.dev = &dev->dev;
         uart_add_one_port(&imx_reg, &imx_ports[dev->id].port);
-        dev_set_drvdata(_dev, &imx_ports[dev->id]);
+        platform_set_drvdata(dev, &imx_ports[dev->id]);
         return 0;
 }
 
-static int serial_imx_remove(struct device *_dev)
+static int serial_imx_remove(struct platform_device *dev)
 {
-        struct imx_port *sport = dev_get_drvdata(_dev);
+        struct imx_port *sport = platform_get_drvdata(dev);
 
-        dev_set_drvdata(_dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if (sport)
                 uart_remove_one_port(&imx_reg, &sport->port);
@@ -963,14 +961,15 @@ static int serial_imx_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver serial_imx_driver = {
-        .name           = "imx-uart",
-        .bus            = &platform_bus_type,
+static struct platform_driver serial_imx_driver = {
         .probe          = serial_imx_probe,
         .remove         = serial_imx_remove,
 
         .suspend        = serial_imx_suspend,
         .resume         = serial_imx_resume,
+        .driver         = {
+                .name   = "imx-uart",
+        },
 };
 
 static int __init imx_serial_init(void)
@@ -985,7 +984,7 @@ static int __init imx_serial_init(void)
         if (ret)
                 return ret;
 
-        ret = driver_register(&serial_imx_driver);
+        ret = platform_driver_register(&serial_imx_driver);
         if (ret != 0)
                 uart_unregister_driver(&imx_reg);
 
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 0dd08a09e7e6..5d3cb8486447 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -717,10 +717,9 @@ static struct uart_driver mpc52xx_uart_driver = {
 /* ======================================================================== */
 
 static int __devinit
-mpc52xx_uart_probe(struct device *dev)
+mpc52xx_uart_probe(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct resource *res = pdev->resource;
+        struct resource *res = dev->resource;
 
         struct uart_port *port = NULL;
         int i, idx, ret;
@@ -761,17 +760,17 @@ mpc52xx_uart_probe(struct device *dev)
         /* Add the port to the uart sub-system */
         ret = uart_add_one_port(&mpc52xx_uart_driver, port);
         if (!ret)
-                dev_set_drvdata(dev, (void*)port);
+                platform_set_drvdata(dev, (void*)port);
 
         return ret;
 }
 
 static int
-mpc52xx_uart_remove(struct device *dev)
+mpc52xx_uart_remove(struct platform_device *dev)
 {
-        struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
+        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if (port)
                 uart_remove_one_port(&mpc52xx_uart_driver, port);
@@ -781,9 +780,9 @@ mpc52xx_uart_remove(struct device *dev)
 
 #ifdef CONFIG_PM
 static int
-mpc52xx_uart_suspend(struct device *dev, pm_message_t state)
+mpc52xx_uart_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
+        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
 
         if (sport)
                 uart_suspend_port(&mpc52xx_uart_driver, port);
@@ -792,9 +791,9 @@ mpc52xx_uart_suspend(struct device *dev, pm_message_t state)
 }
 
 static int
-mpc52xx_uart_resume(struct device *dev)
+mpc52xx_uart_resume(struct platform_device *dev)
 {
-        struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
+        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
 
         if (port)
                 uart_resume_port(&mpc52xx_uart_driver, port);
@@ -803,15 +802,16 @@ mpc52xx_uart_resume(struct device *dev)
 }
 #endif
 
-static struct device_driver mpc52xx_uart_platform_driver = {
-        .name           = "mpc52xx-psc",
-        .bus            = &platform_bus_type,
+static struct platform_driver mpc52xx_uart_platform_driver = {
         .probe          = mpc52xx_uart_probe,
         .remove         = mpc52xx_uart_remove,
 #ifdef CONFIG_PM
         .suspend        = mpc52xx_uart_suspend,
         .resume         = mpc52xx_uart_resume,
 #endif
+        .driver         = {
+                .name   = "mpc52xx-psc",
+        },
 };
 
 
@@ -828,7 +828,7 @@ mpc52xx_uart_init(void)
 
         ret = uart_register_driver(&mpc52xx_uart_driver);
         if (ret == 0) {
-                ret = driver_register(&mpc52xx_uart_platform_driver);
+                ret = platform_driver_register(&mpc52xx_uart_platform_driver);
                 if (ret)
                         uart_unregister_driver(&mpc52xx_uart_driver);
         }
@@ -839,7 +839,7 @@ mpc52xx_uart_init(void)
 static void __exit
 mpc52xx_uart_exit(void)
 {
-        driver_unregister(&mpc52xx_uart_platform_driver);
+        platform_driver_unregister(&mpc52xx_uart_platform_driver);
         uart_unregister_driver(&mpc52xx_uart_driver);
 }
 
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index ba8838b234da..8f83e4007ecd 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -1551,15 +1551,14 @@ mpsc_shared_unmap_regs(void)
 }
 
 static int
-mpsc_shared_drv_probe(struct device *dev)
+mpsc_shared_drv_probe(struct platform_device *dev)
 {
-        struct platform_device          *pd = to_platform_device(dev);
         struct mpsc_shared_pdata        *pdata;
         int                              rc = -ENODEV;
 
-        if (pd->id == 0) {
-                if (!(rc = mpsc_shared_map_regs(pd)))  {
-                        pdata = (struct mpsc_shared_pdata *)dev->platform_data;
+        if (dev->id == 0) {
+                if (!(rc = mpsc_shared_map_regs(dev)))  {
+                        pdata = (struct mpsc_shared_pdata *)dev->dev.platform_data;
 
                         mpsc_shared_regs.MPSC_MRR_m = pdata->mrr_val;
                         mpsc_shared_regs.MPSC_RCRR_m= pdata->rcrr_val;
@@ -1577,12 +1576,11 @@ mpsc_shared_drv_probe(struct device *dev)
 }
 
 static int
-mpsc_shared_drv_remove(struct device *dev)
+mpsc_shared_drv_remove(struct platform_device *dev)
 {
-        struct platform_device  *pd = to_platform_device(dev);
         int     rc = -ENODEV;
 
-        if (pd->id == 0) {
+        if (dev->id == 0) {
                 mpsc_shared_unmap_regs();
                 mpsc_shared_regs.MPSC_MRR_m = 0;
                 mpsc_shared_regs.MPSC_RCRR_m = 0;
@@ -1595,11 +1593,12 @@ mpsc_shared_drv_remove(struct device *dev)
         return rc;
 }
 
-static struct device_driver mpsc_shared_driver = {
-        .name   = MPSC_SHARED_NAME,
-        .bus    = &platform_bus_type,
+static struct platform_driver mpsc_shared_driver = {
         .probe  = mpsc_shared_drv_probe,
         .remove = mpsc_shared_drv_remove,
+        .driver = {
+                .name = MPSC_SHARED_NAME,
+        },
 };
 
 /*
@@ -1732,19 +1731,18 @@ mpsc_drv_get_platform_data(struct mpsc_port_info *pi,
 }
 
 static int
-mpsc_drv_probe(struct device *dev)
+mpsc_drv_probe(struct platform_device *dev)
 {
-        struct platform_device  *pd = to_platform_device(dev);
         struct mpsc_port_info   *pi;
         int                     rc = -ENODEV;
 
-        pr_debug("mpsc_drv_probe: Adding MPSC %d\n", pd->id);
+        pr_debug("mpsc_drv_probe: Adding MPSC %d\n", dev->id);
 
-        if (pd->id < MPSC_NUM_CTLRS) {
-                pi = &mpsc_ports[pd->id];
+        if (dev->id < MPSC_NUM_CTLRS) {
+                pi = &mpsc_ports[dev->id];
 
-                if (!(rc = mpsc_drv_map_regs(pi, pd))) {
-                        mpsc_drv_get_platform_data(pi, pd, pd->id);
+                if (!(rc = mpsc_drv_map_regs(pi, dev))) {
+                        mpsc_drv_get_platform_data(pi, dev, dev->id);
 
                         if (!(rc = mpsc_make_ready(pi)))
                                 if (!(rc = uart_add_one_port(&mpsc_reg,
@@ -1764,27 +1762,26 @@ mpsc_drv_probe(struct device *dev)
 }
 
 static int
-mpsc_drv_remove(struct device *dev)
+mpsc_drv_remove(struct platform_device *dev)
 {
-        struct platform_device  *pd = to_platform_device(dev);
+        pr_debug("mpsc_drv_exit: Removing MPSC %d\n", dev->id);
 
-        pr_debug("mpsc_drv_exit: Removing MPSC %d\n", pd->id);
-
-        if (pd->id < MPSC_NUM_CTLRS) {
-                uart_remove_one_port(&mpsc_reg, &mpsc_ports[pd->id].port);
-                mpsc_release_port((struct uart_port *)&mpsc_ports[pd->id].port);
-                mpsc_drv_unmap_regs(&mpsc_ports[pd->id]);
+        if (dev->id < MPSC_NUM_CTLRS) {
+                uart_remove_one_port(&mpsc_reg, &mpsc_ports[dev->id].port);
+                mpsc_release_port((struct uart_port *)&mpsc_ports[dev->id].port);
+                mpsc_drv_unmap_regs(&mpsc_ports[dev->id]);
                 return 0;
         }
         else
                 return -ENODEV;
 }
 
-static struct device_driver mpsc_driver = {
-        .name   = MPSC_CTLR_NAME,
-        .bus    = &platform_bus_type,
+static struct platform_driver mpsc_driver = {
         .probe  = mpsc_drv_probe,
         .remove = mpsc_drv_remove,
+        .driver = {
+                .name = MPSC_CTLR_NAME,
+        },
 };
 
 static int __init
@@ -1798,9 +1795,9 @@ mpsc_drv_init(void)
         memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs));
 
         if (!(rc = uart_register_driver(&mpsc_reg))) {
-                if (!(rc = driver_register(&mpsc_shared_driver))) {
-                        if ((rc = driver_register(&mpsc_driver))) {
-                                driver_unregister(&mpsc_shared_driver);
+                if (!(rc = platform_driver_register(&mpsc_shared_driver))) {
+                        if ((rc = platform_driver_register(&mpsc_driver))) {
+                                platform_driver_unregister(&mpsc_shared_driver);
                                 uart_unregister_driver(&mpsc_reg);
                         }
                 }
@@ -1815,8 +1812,8 @@ mpsc_drv_init(void)
 static void __exit
 mpsc_drv_exit(void)
 {
-        driver_unregister(&mpsc_driver);
-        driver_unregister(&mpsc_shared_driver);
+        platform_driver_unregister(&mpsc_driver);
+        platform_driver_unregister(&mpsc_shared_driver);
         uart_unregister_driver(&mpsc_reg);
         memset(mpsc_ports, 0, sizeof(mpsc_ports));
         memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs));
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 16b2f9417af9..ff5e6309d682 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -805,9 +805,9 @@ static struct uart_driver serial_pxa_reg = {
         .cons           = PXA_CONSOLE,
 };
 
-static int serial_pxa_suspend(struct device *_dev, pm_message_t state)
+static int serial_pxa_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct uart_pxa_port *sport = dev_get_drvdata(_dev);
+        struct uart_pxa_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_suspend_port(&serial_pxa_reg, &sport->port);
@@ -815,9 +815,9 @@ static int serial_pxa_suspend(struct device *_dev, pm_message_t state)
         return 0;
 }
 
-static int serial_pxa_resume(struct device *_dev)
+static int serial_pxa_resume(struct platform_device *dev)
 {
-        struct uart_pxa_port *sport = dev_get_drvdata(_dev);
+        struct uart_pxa_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_resume_port(&serial_pxa_reg, &sport->port);
@@ -825,21 +825,19 @@ static int serial_pxa_resume(struct device *_dev)
         return 0;
 }
 
-static int serial_pxa_probe(struct device *_dev)
+static int serial_pxa_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
-
-        serial_pxa_ports[dev->id].port.dev = _dev;
+        serial_pxa_ports[dev->id].port.dev = &dev->dev;
         uart_add_one_port(&serial_pxa_reg, &serial_pxa_ports[dev->id].port);
-        dev_set_drvdata(_dev, &serial_pxa_ports[dev->id]);
+        platform_set_drvdata(dev, &serial_pxa_ports[dev->id]);
         return 0;
 }
 
-static int serial_pxa_remove(struct device *_dev)
+static int serial_pxa_remove(struct platform_device *dev)
 {
-        struct uart_pxa_port *sport = dev_get_drvdata(_dev);
+        struct uart_pxa_port *sport = platform_get_drvdata(dev);
 
-        dev_set_drvdata(_dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if (sport)
                 uart_remove_one_port(&serial_pxa_reg, &sport->port);
@@ -847,14 +845,15 @@ static int serial_pxa_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver serial_pxa_driver = {
-        .name           = "pxa2xx-uart",
-        .bus            = &platform_bus_type,
+static struct platform_driver serial_pxa_driver = {
         .probe          = serial_pxa_probe,
         .remove         = serial_pxa_remove,
 
         .suspend        = serial_pxa_suspend,
         .resume         = serial_pxa_resume,
+        .driver         = {
+                .name   = "pxa2xx-uart",
+        },
 };
 
 int __init serial_pxa_init(void)
@@ -865,7 +864,7 @@ int __init serial_pxa_init(void)
         if (ret != 0)
                 return ret;
 
-        ret = driver_register(&serial_pxa_driver);
+        ret = platform_driver_register(&serial_pxa_driver);
         if (ret != 0)
                 uart_unregister_driver(&serial_pxa_reg);
 
@@ -874,7 +873,7 @@ int __init serial_pxa_init(void)
 
 void __exit serial_pxa_exit(void)
 {
-        driver_unregister(&serial_pxa_driver);
+        platform_driver_unregister(&serial_pxa_driver);
         uart_unregister_driver(&serial_pxa_reg);
 }
 
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 036792328d49..47681c4654e4 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1092,14 +1092,13 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
 
 static int probe_index = 0;
 
-static int s3c24xx_serial_probe(struct device *_dev,
+static int s3c24xx_serial_probe(struct platform_device *dev,
                                 struct s3c24xx_uart_info *info)
 {
         struct s3c24xx_uart_port *ourport;
-        struct platform_device *dev = to_platform_device(_dev);
         int ret;
 
-        dbg("s3c24xx_serial_probe(%p, %p) %d\n", _dev, info, probe_index);
+        dbg("s3c24xx_serial_probe(%p, %p) %d\n", dev, info, probe_index);
 
         ourport = &s3c24xx_serial_ports[probe_index];
         probe_index++;
@@ -1112,7 +1111,7 @@ static int s3c24xx_serial_probe(struct device *_dev,
 
         dbg("%s: adding port\n", __FUNCTION__);
         uart_add_one_port(&s3c24xx_uart_drv, &ourport->port);
-        dev_set_drvdata(_dev, &ourport->port);
+        platform_set_drvdata(dev, &ourport->port);
 
         return 0;
 
@@ -1120,9 +1119,9 @@ static int s3c24xx_serial_probe(struct device *_dev,
         return ret;
 }
 
-static int s3c24xx_serial_remove(struct device *_dev)
+static int s3c24xx_serial_remove(struct platform_device *dev)
 {
-        struct uart_port *port = s3c24xx_dev_to_port(_dev);
+        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
 
         if (port)
                 uart_remove_one_port(&s3c24xx_uart_drv, port);
@@ -1134,9 +1133,9 @@ static int s3c24xx_serial_remove(struct device *_dev)
 
 #ifdef CONFIG_PM
 
-static int s3c24xx_serial_suspend(struct device *dev, pm_message_t state)
+static int s3c24xx_serial_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct uart_port *port = s3c24xx_dev_to_port(dev);
+        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
 
         if (port)
                 uart_suspend_port(&s3c24xx_uart_drv, port);
@@ -1144,9 +1143,9 @@ static int s3c24xx_serial_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int s3c24xx_serial_resume(struct device *dev)
+static int s3c24xx_serial_resume(struct platform_device *dev)
 {
-        struct uart_port *port = s3c24xx_dev_to_port(dev);
+        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
         if (port) {
@@ -1165,11 +1164,11 @@ static int s3c24xx_serial_resume(struct device *dev)
 #define s3c24xx_serial_resume  NULL
 #endif
 
-static int s3c24xx_serial_init(struct device_driver *drv,
+static int s3c24xx_serial_init(struct platform_driver *drv,
                                struct s3c24xx_uart_info *info)
 {
         dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
-        return driver_register(drv);
+        return platform_driver_register(drv);
 }
 
 
@@ -1228,19 +1227,20 @@ static struct s3c24xx_uart_info s3c2400_uart_inf = {
         .reset_port     = s3c2400_serial_resetport,
 };
 
-static int s3c2400_serial_probe(struct device *dev)
+static int s3c2400_serial_probe(struct platform_device *dev)
 {
         return s3c24xx_serial_probe(dev, &s3c2400_uart_inf);
 }
 
-static struct device_driver s3c2400_serial_drv = {
-        .name           = "s3c2400-uart",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2400_serial_drv = {
         .probe          = s3c2400_serial_probe,
         .remove         = s3c24xx_serial_remove,
         .suspend        = s3c24xx_serial_suspend,
         .resume         = s3c24xx_serial_resume,
+        .driver         = {
+                .name   = "s3c2400-uart",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static inline int s3c2400_serial_init(void)
@@ -1250,7 +1250,7 @@ static inline int s3c2400_serial_init(void)
 
 static inline void s3c2400_serial_exit(void)
 {
-        driver_unregister(&s3c2400_serial_drv);
+        platform_driver_unregister(&s3c2400_serial_drv);
 }
 
 #define s3c2400_uart_inf_at &s3c2400_uart_inf
@@ -1332,19 +1332,20 @@ static struct s3c24xx_uart_info s3c2410_uart_inf = {
 
 /* device management */
 
-static int s3c2410_serial_probe(struct device *dev)
+static int s3c2410_serial_probe(struct platform_device *dev)
 {
         return s3c24xx_serial_probe(dev, &s3c2410_uart_inf);
 }
 
-static struct device_driver s3c2410_serial_drv = {
-        .name           = "s3c2410-uart",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410_serial_drv = {
         .probe          = s3c2410_serial_probe,
         .remove         = s3c24xx_serial_remove,
         .suspend        = s3c24xx_serial_suspend,
         .resume         = s3c24xx_serial_resume,
+        .driver         = {
+                .name   = "s3c2410-uart",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static inline int s3c2410_serial_init(void)
@@ -1354,7 +1355,7 @@ static inline int s3c2410_serial_init(void)
 
 static inline void s3c2410_serial_exit(void)
 {
-        driver_unregister(&s3c2410_serial_drv);
+        platform_driver_unregister(&s3c2410_serial_drv);
 }
 
 #define s3c2410_uart_inf_at &s3c2410_uart_inf
@@ -1493,20 +1494,21 @@ static struct s3c24xx_uart_info s3c2440_uart_inf = {
 
 /* device management */
 
-static int s3c2440_serial_probe(struct device *dev)
+static int s3c2440_serial_probe(struct platform_device *dev)
 {
         dbg("s3c2440_serial_probe: dev=%p\n", dev);
         return s3c24xx_serial_probe(dev, &s3c2440_uart_inf);
 }
 
-static struct device_driver s3c2440_serial_drv = {
-        .name           = "s3c2440-uart",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2440_serial_drv = {
         .probe          = s3c2440_serial_probe,
         .remove         = s3c24xx_serial_remove,
         .suspend        = s3c24xx_serial_suspend,
         .resume         = s3c24xx_serial_resume,
+        .driver         = {
+                .name   = "s3c2440-uart",
+                .owner  = THIS_MODULE,
+        },
 };
 
 
@@ -1517,7 +1519,7 @@ static inline int s3c2440_serial_init(void)
 
 static inline void s3c2440_serial_exit(void)
 {
-        driver_unregister(&s3c2440_serial_drv);
+        platform_driver_unregister(&s3c2440_serial_drv);
 }
 
 #define s3c2440_uart_inf_at &s3c2440_uart_inf
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index ed618cc7ae96..fd9deee20e05 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -834,9 +834,9 @@ static struct uart_driver sa1100_reg = {
         .cons                   = SA1100_CONSOLE,
 };
 
-static int sa1100_serial_suspend(struct device *_dev, pm_message_t state)
+static int sa1100_serial_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct sa1100_port *sport = dev_get_drvdata(_dev);
+        struct sa1100_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_suspend_port(&sa1100_reg, &sport->port);
@@ -844,9 +844,9 @@ static int sa1100_serial_suspend(struct device *_dev, pm_message_t state)
         return 0;
 }
 
-static int sa1100_serial_resume(struct device *_dev)
+static int sa1100_serial_resume(struct platform_device *dev)
 {
-        struct sa1100_port *sport = dev_get_drvdata(_dev);
+        struct sa1100_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_resume_port(&sa1100_reg, &sport->port);
@@ -854,9 +854,8 @@ static int sa1100_serial_resume(struct device *_dev)
         return 0;
 }
 
-static int sa1100_serial_probe(struct device *_dev)
+static int sa1100_serial_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct resource *res = dev->resource;
         int i;
 
@@ -869,9 +868,9 @@ static int sa1100_serial_probe(struct device *_dev)
                         if (sa1100_ports[i].port.mapbase != res->start)
                                 continue;
 
-                        sa1100_ports[i].port.dev = _dev;
+                        sa1100_ports[i].port.dev = &dev->dev;
                         uart_add_one_port(&sa1100_reg, &sa1100_ports[i].port);
-                        dev_set_drvdata(_dev, &sa1100_ports[i]);
+                        platform_set_drvdata(dev, &sa1100_ports[i]);
                         break;
                 }
         }
@@ -879,11 +878,11 @@ static int sa1100_serial_probe(struct device *_dev)
         return 0;
 }
 
-static int sa1100_serial_remove(struct device *_dev)
+static int sa1100_serial_remove(struct platform_device *pdev)
 {
-        struct sa1100_port *sport = dev_get_drvdata(_dev);
+        struct sa1100_port *sport = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(_dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (sport)
                 uart_remove_one_port(&sa1100_reg, &sport->port);
@@ -891,13 +890,14 @@ static int sa1100_serial_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver sa11x0_serial_driver = {
-        .name           = "sa11x0-uart",
-        .bus            = &platform_bus_type,
+static struct platform_driver sa11x0_serial_driver = {
         .probe          = sa1100_serial_probe,
         .remove         = sa1100_serial_remove,
         .suspend        = sa1100_serial_suspend,
         .resume         = sa1100_serial_resume,
+        .driver         = {
+                .name   = "sa11x0-uart",
+        },
 };
 
 static int __init sa1100_serial_init(void)
@@ -910,7 +910,7 @@ static int __init sa1100_serial_init(void)
 
         ret = uart_register_driver(&sa1100_reg);
         if (ret == 0) {
-                ret = driver_register(&sa11x0_serial_driver);
+                ret = platform_driver_register(&sa11x0_serial_driver);
                 if (ret)
                         uart_unregister_driver(&sa1100_reg);
         }
@@ -919,7 +919,7 @@ static int __init sa1100_serial_init(void)
 
 static void __exit sa1100_serial_exit(void)
 {
-        driver_unregister(&sa11x0_serial_driver);
+        platform_driver_unregister(&sa11x0_serial_driver);
         uart_unregister_driver(&sa1100_reg);
 }
 
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index 01696b3e3f61..865d4dea65df 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -924,7 +924,7 @@ static struct uart_driver siu_uart_driver = {
         .cons           = SERIAL_VR41XX_CONSOLE,
 };
 
-static int siu_probe(struct device *dev)
+static int siu_probe(struct platform_device *dev)
 {
         struct uart_port *port;
         int num, i, retval;
@@ -941,7 +941,7 @@ static int siu_probe(struct device *dev)
         for (i = 0; i < num; i++) {
                 port = &siu_uart_ports[i];
                 port->ops = &siu_uart_ops;
-                port->dev = dev;
+                port->dev = &dev->dev;
 
                 retval = uart_add_one_port(&siu_uart_driver, port);
                 if (retval < 0) {
@@ -958,14 +958,14 @@ static int siu_probe(struct device *dev)
         return 0;
 }
 
-static int siu_remove(struct device *dev)
+static int siu_remove(struct platform_device *dev)
 {
         struct uart_port *port;
         int i;
 
         for (i = 0; i < siu_uart_driver.nr; i++) {
                 port = &siu_uart_ports[i];
-                if (port->dev == dev) {
+                if (port->dev == &dev->dev) {
                         uart_remove_one_port(&siu_uart_driver, port);
                         port->dev = NULL;
                 }
@@ -976,7 +976,7 @@ static int siu_remove(struct device *dev)
         return 0;
 }
 
-static int siu_suspend(struct device *dev, pm_message_t state)
+static int siu_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct uart_port *port;
         int i;
@@ -984,7 +984,7 @@ static int siu_suspend(struct device *dev, pm_message_t state)
         for (i = 0; i < siu_uart_driver.nr; i++) {
                 port = &siu_uart_ports[i];
                 if ((port->type == PORT_VR41XX_SIU ||
-                     port->type == PORT_VR41XX_DSIU) && port->dev == dev)
+                     port->type == PORT_VR41XX_DSIU) && port->dev == &dev->dev)
                         uart_suspend_port(&siu_uart_driver, port);
 
         }
@@ -992,7 +992,7 @@ static int siu_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int siu_resume(struct device *dev)
+static int siu_resume(struct platform_device *dev)
 {
         struct uart_port *port;
         int i;
@@ -1000,7 +1000,7 @@ static int siu_resume(struct device *dev)
         for (i = 0; i < siu_uart_driver.nr; i++) {
                 port = &siu_uart_ports[i];
                 if ((port->type == PORT_VR41XX_SIU ||
-                     port->type == PORT_VR41XX_DSIU) && port->dev == dev)
+                     port->type == PORT_VR41XX_DSIU) && port->dev == &dev->dev)
                         uart_resume_port(&siu_uart_driver, port);
         }
 
@@ -1009,13 +1009,14 @@ static int siu_resume(struct device *dev)
 
 static struct platform_device *siu_platform_device;
 
-static struct device_driver siu_device_driver = {
-        .name           = "SIU",
-        .bus            = &platform_bus_type,
+static struct platform_driver siu_device_driver = {
         .probe          = siu_probe,
         .remove         = siu_remove,
         .suspend        = siu_suspend,
         .resume         = siu_resume,
+        .driver         = {
+                .name   = "SIU",
+        },
 };
 
 static int __devinit vr41xx_siu_init(void)
@@ -1026,7 +1027,7 @@ static int __devinit vr41xx_siu_init(void)
         if (IS_ERR(siu_platform_device))
                 return PTR_ERR(siu_platform_device);
 
-        retval = driver_register(&siu_device_driver);
+        retval = platform_driver_register(&siu_device_driver);
         if (retval < 0)
                 platform_device_unregister(siu_platform_device);
 
@@ -1035,7 +1036,7 @@ static int __devinit vr41xx_siu_init(void)
 
 static void __devexit vr41xx_siu_exit(void)
 {
-        driver_unregister(&siu_device_driver);
+        platform_driver_unregister(&siu_device_driver);
 
         platform_device_unregister(siu_platform_device);
 }
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 904519085334..1e407745c115 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -896,7 +896,7 @@ dummy_gadget_release (struct device *dev)
 #endif
 }
 
-static int dummy_udc_probe (struct device *dev)
+static int dummy_udc_probe (struct platform_device *dev)
 {
         struct dummy    *dum = the_controller;
         int             rc;
@@ -909,7 +909,7 @@ static int dummy_udc_probe (struct device *dev)
         dum->gadget.is_otg = (dummy_to_hcd(dum)->self.otg_port != 0);
 
         strcpy (dum->gadget.dev.bus_id, "gadget");
-        dum->gadget.dev.parent = dev;
+        dum->gadget.dev.parent = &dev->dev;
         dum->gadget.dev.release = dummy_gadget_release;
         rc = device_register (&dum->gadget.dev);
         if (rc < 0)
@@ -919,26 +919,26 @@ static int dummy_udc_probe (struct device *dev)
         usb_bus_get (&dummy_to_hcd (dum)->self);
 #endif
 
-        dev_set_drvdata (dev, dum);
+        platform_set_drvdata (dev, dum);
         device_create_file (&dum->gadget.dev, &dev_attr_function);
         return rc;
 }
 
-static int dummy_udc_remove (struct device *dev)
+static int dummy_udc_remove (struct platform_device *dev)
 {
-        struct dummy    *dum = dev_get_drvdata (dev);
+        struct dummy    *dum = platform_get_drvdata (dev);
 
-        dev_set_drvdata (dev, NULL);
+        platform_set_drvdata (dev, NULL);
         device_remove_file (&dum->gadget.dev, &dev_attr_function);
         device_unregister (&dum->gadget.dev);
         return 0;
 }
 
-static int dummy_udc_suspend (struct device *dev, pm_message_t state)
+static int dummy_udc_suspend (struct platform_device *dev, pm_message_t state)
 {
-        struct dummy    *dum = dev_get_drvdata(dev);
+        struct dummy    *dum = platform_get_drvdata(dev);
 
-        dev_dbg (dev, "%s\n", __FUNCTION__);
+        dev_dbg (&dev->dev, "%s\n", __FUNCTION__);
         spin_lock_irq (&dum->lock);
         dum->udc_suspended = 1;
         set_link_state (dum);
@@ -949,29 +949,30 @@ static int dummy_udc_suspend (struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int dummy_udc_resume (struct device *dev)
+static int dummy_udc_resume (struct platform_device *dev)
 {
-        struct dummy    *dum = dev_get_drvdata(dev);
+        struct dummy    *dum = platform_get_drvdata(dev);
 
-        dev_dbg (dev, "%s\n", __FUNCTION__);
+        dev_dbg (&dev->dev, "%s\n", __FUNCTION__);
         spin_lock_irq (&dum->lock);
         dum->udc_suspended = 0;
         set_link_state (dum);
         spin_unlock_irq (&dum->lock);
 
-        dev->power.power_state = PMSG_ON;
+        dev->dev.power.power_state = PMSG_ON;
         usb_hcd_poll_rh_status (dummy_to_hcd (dum));
         return 0;
 }
 
-static struct device_driver dummy_udc_driver = {
-        .name           = (char *) gadget_name,
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver dummy_udc_driver = {
         .probe          = dummy_udc_probe,
         .remove         = dummy_udc_remove,
         .suspend        = dummy_udc_suspend,
         .resume         = dummy_udc_resume,
+        .driver         = {
+                .name   = (char *) gadget_name,
+                .owner  = THIS_MODULE,
+        },
 };
 
 /*-------------------------------------------------------------------------*/
@@ -1898,14 +1899,14 @@ static const struct hc_driver dummy_hcd = {
         .bus_resume =           dummy_bus_resume,
 };
 
-static int dummy_hcd_probe (struct device *dev)
+static int dummy_hcd_probe (struct platform_device *dev)
 {
         struct usb_hcd          *hcd;
         int                     retval;
 
         dev_info (dev, "%s, driver " DRIVER_VERSION "\n", driver_desc);
 
-        hcd = usb_create_hcd (&dummy_hcd, dev, dev->bus_id);
+        hcd = usb_create_hcd (&dummy_hcd, &dev->dev, dev->dev.bus_id);
         if (!hcd)
                 return -ENOMEM;
         the_controller = hcd_to_dummy (hcd);
@@ -1918,48 +1919,49 @@ static int dummy_hcd_probe (struct device *dev)
         return retval;
 }
 
-static int dummy_hcd_remove (struct device *dev)
+static int dummy_hcd_remove (struct platform_device *dev)
 {
         struct usb_hcd          *hcd;
 
-        hcd = dev_get_drvdata (dev);
+        hcd = platform_get_drvdata (dev);
         usb_remove_hcd (hcd);
         usb_put_hcd (hcd);
         the_controller = NULL;
         return 0;
 }
 
-static int dummy_hcd_suspend (struct device *dev, pm_message_t state)
+static int dummy_hcd_suspend (struct platform_device *dev, pm_message_t state)
 {
         struct usb_hcd          *hcd;
 
-        dev_dbg (dev, "%s\n", __FUNCTION__);
-        hcd = dev_get_drvdata (dev);
+        dev_dbg (&dev->dev, "%s\n", __FUNCTION__);
+        hcd = platform_get_drvdata (dev);
 
         hcd->state = HC_STATE_SUSPENDED;
         return 0;
 }
 
-static int dummy_hcd_resume (struct device *dev)
+static int dummy_hcd_resume (struct platform_device *dev)
 {
         struct usb_hcd          *hcd;
 
-        dev_dbg (dev, "%s\n", __FUNCTION__);
-        hcd = dev_get_drvdata (dev);
+        dev_dbg (&dev->dev, "%s\n", __FUNCTION__);
+        hcd = platform_get_drvdata (dev);
         hcd->state = HC_STATE_RUNNING;
 
         usb_hcd_poll_rh_status (hcd);
         return 0;
 }
 
-static struct device_driver dummy_hcd_driver = {
-        .name           = (char *) driver_name,
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver dummy_hcd_driver = {
         .probe          = dummy_hcd_probe,
         .remove         = dummy_hcd_remove,
         .suspend        = dummy_hcd_suspend,
         .resume         = dummy_hcd_resume,
+        .driver         = {
+                .name   = (char *) driver_name,
+                .owner  = THIS_MODULE,
+        },
 };
 
 /*-------------------------------------------------------------------------*/
@@ -1995,11 +1997,11 @@ static int __init init (void)
         if (usb_disabled ())
                 return -ENODEV;
 
-        retval = driver_register (&dummy_hcd_driver);
+        retval = platform_driver_register (&dummy_hcd_driver);
         if (retval < 0)
                 return retval;
 
-        retval = driver_register (&dummy_udc_driver);
+        retval = platform_driver_register (&dummy_udc_driver);
         if (retval < 0)
                 goto err_register_udc_driver;
 
@@ -2015,9 +2017,9 @@ static int __init init (void)
 err_register_udc:
         platform_device_unregister (&the_hcd_pdev);
 err_register_hcd:
-        driver_unregister (&dummy_udc_driver);
+        platform_driver_unregister (&dummy_udc_driver);
 err_register_udc_driver:
-        driver_unregister (&dummy_hcd_driver);
+        platform_driver_unregister (&dummy_hcd_driver);
         return retval;
 }
 module_init (init);
@@ -2026,7 +2028,7 @@ static void __exit cleanup (void)
 {
         platform_device_unregister (&the_udc_pdev);
         platform_device_unregister (&the_hcd_pdev);
-        driver_unregister (&dummy_udc_driver);
-        driver_unregister (&dummy_hcd_driver);
+        platform_driver_unregister (&dummy_udc_driver);
+        platform_driver_unregister (&dummy_hcd_driver);
 }
 module_exit (cleanup);
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 654469778ab5..b0f3cd63e3b9 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1970,7 +1970,6 @@ MODULE_DEVICE_TABLE (pci, pci_ids);
 static struct pci_driver goku_pci_driver = {
         .name =         (char *) driver_name,
         .id_table =     pci_ids,
-        .owner =        THIS_MODULE,
 
         .probe =        goku_probe,
         .remove =       goku_remove,
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index bc6269f10cbb..e02fea5a5433 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -2085,21 +2085,21 @@ static struct lh7a40x_udc memory = {
 /*
  *      probe - binds to the platform device
  */
-static int lh7a40x_udc_probe(struct device *_dev)
+static int lh7a40x_udc_probe(struct platform_device *pdev)
 {
         struct lh7a40x_udc *dev = &memory;
         int retval;
 
-        DEBUG("%s: %p\n", __FUNCTION__, _dev);
+        DEBUG("%s: %p\n", __FUNCTION__, pdev);
 
         spin_lock_init(&dev->lock);
-        dev->dev = _dev;
+        dev->dev = &pdev->dev;
 
         device_initialize(&dev->gadget.dev);
-        dev->gadget.dev.parent = _dev;
+        dev->gadget.dev.parent = &pdev->dev;
 
         the_controller = dev;
-        dev_set_drvdata(_dev, dev);
+        platform_set_drvdata(pdev, dev);
 
         udc_disable(dev);
         udc_reinit(dev);
@@ -2119,11 +2119,11 @@ static int lh7a40x_udc_probe(struct device *_dev)
         return retval;
 }
 
-static int lh7a40x_udc_remove(struct device *_dev)
+static int lh7a40x_udc_remove(struct platform_device *pdev)
 {
-        struct lh7a40x_udc *dev = _dev->driver_data;
+        struct lh7a40x_udc *dev = platform_get_drvdata(pdev);
 
-        DEBUG("%s: %p\n", __FUNCTION__, dev);
+        DEBUG("%s: %p\n", __FUNCTION__, pdev);
 
         udc_disable(dev);
         remove_proc_files();
@@ -2131,7 +2131,7 @@ static int lh7a40x_udc_remove(struct device *_dev)
 
         free_irq(IRQ_USBINTR, dev);
 
-        dev_set_drvdata(_dev, 0);
+        platform_set_drvdata(pdev, 0);
 
         the_controller = 0;
 
@@ -2140,26 +2140,27 @@ static int lh7a40x_udc_remove(struct device *_dev)
 
 /*-------------------------------------------------------------------------*/
 
-static struct device_driver udc_driver = {
-        .name = (char *)driver_name,
-        .owner = THIS_MODULE,
-        .bus = &platform_bus_type,
+static struct platform_driver udc_driver = {
         .probe = lh7a40x_udc_probe,
         .remove = lh7a40x_udc_remove
             /* FIXME power management support */
             /* .suspend = ... disable UDC */
             /* .resume = ... re-enable UDC */
+        .driver = {
+                .name = (char *)driver_name,
+                .owner = THIS_MODULE,
+        },
 };
 
 static int __init udc_init(void)
 {
         DEBUG("%s: %s version %s\n", __FUNCTION__, driver_name, DRIVER_VERSION);
-        return driver_register(&udc_driver);
+        return platform_driver_register(&udc_driver);
 }
 
 static void __exit udc_exit(void)
 {
-        driver_unregister(&udc_driver);
+        platform_driver_unregister(&udc_driver);
 }
 
 module_init(udc_init);
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 0dc6bb00bf72..c32e1f7476da 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2948,7 +2948,6 @@ MODULE_DEVICE_TABLE (pci, pci_ids);
 static struct pci_driver net2280_pci_driver = {
         .name =         (char *) driver_name,
         .id_table =     pci_ids,
-        .owner =        THIS_MODULE,
 
         .probe =        net2280_probe,
         .remove =       net2280_remove,
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 387692a3611e..a8972d7c97be 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2707,18 +2707,17 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
         return 0;
 }
 
-static int __init omap_udc_probe(struct device *dev)
+static int __init omap_udc_probe(struct platform_device *pdev)
 {
-        struct platform_device  *odev = to_platform_device(dev);
         int                     status = -ENODEV;
         int                     hmc;
         struct otg_transceiver  *xceiv = NULL;
         const char              *type = NULL;
-        struct omap_usb_config  *config = dev->platform_data;
+        struct omap_usb_config  *config = pdev->dev.platform_data;
 
         /* NOTE:  "knows" the order of the resources! */
-        if (!request_mem_region(odev->resource[0].start, 
-                        odev->resource[0].end - odev->resource[0].start + 1,
+        if (!request_mem_region(pdev->resource[0].start, 
+                        pdev->resource[0].end - pdev->resource[0].start + 1,
                         driver_name)) {
                 DBG("request_mem_region failed\n");
                 return -EBUSY;
@@ -2803,7 +2802,7 @@ bad_on_1710:
         INFO("hmc mode %d, %s transceiver\n", hmc, type);
 
         /* a "gadget" abstracts/virtualizes the controller */
-        status = omap_udc_setup(odev, xceiv);
+        status = omap_udc_setup(pdev, xceiv);
         if (status) {
                 goto cleanup0;
         }
@@ -2821,28 +2820,28 @@ bad_on_1710:
                 udc->clr_halt = UDC_RESET_EP;
 
         /* USB general purpose IRQ:  ep0, state changes, dma, etc */
-        status = request_irq(odev->resource[1].start, omap_udc_irq,
+        status = request_irq(pdev->resource[1].start, omap_udc_irq,
                         SA_SAMPLE_RANDOM, driver_name, udc);
         if (status != 0) {
                 ERR( "can't get irq %ld, err %d\n",
-                        odev->resource[1].start, status);
+                        pdev->resource[1].start, status);
                 goto cleanup1;
         }
 
         /* USB "non-iso" IRQ (PIO for all but ep0) */
-        status = request_irq(odev->resource[2].start, omap_udc_pio_irq,
+        status = request_irq(pdev->resource[2].start, omap_udc_pio_irq,
                         SA_SAMPLE_RANDOM, "omap_udc pio", udc);
         if (status != 0) {
                 ERR( "can't get irq %ld, err %d\n",
-                        odev->resource[2].start, status);
+                        pdev->resource[2].start, status);
                 goto cleanup2;
         }
 #ifdef  USE_ISO
-        status = request_irq(odev->resource[3].start, omap_udc_iso_irq,
+        status = request_irq(pdev->resource[3].start, omap_udc_iso_irq,
                         SA_INTERRUPT, "omap_udc iso", udc);
         if (status != 0) {
                 ERR("can't get irq %ld, err %d\n",
-                        odev->resource[3].start, status);
+                        pdev->resource[3].start, status);
                 goto cleanup3;
         }
 #endif
@@ -2853,11 +2852,11 @@ bad_on_1710:
 
 #ifdef  USE_ISO
 cleanup3:
-        free_irq(odev->resource[2].start, udc);
+        free_irq(pdev->resource[2].start, udc);
 #endif
 
 cleanup2:
-        free_irq(odev->resource[1].start, udc);
+        free_irq(pdev->resource[1].start, udc);
 
 cleanup1:
         kfree (udc);
@@ -2866,14 +2865,13 @@ cleanup1:
 cleanup0:
         if (xceiv)
                 put_device(xceiv->dev);
-        release_mem_region(odev->resource[0].start,
-                        odev->resource[0].end - odev->resource[0].start + 1);
+        release_mem_region(pdev->resource[0].start,
+                        pdev->resource[0].end - pdev->resource[0].start + 1);
         return status;
 }
 
-static int __exit omap_udc_remove(struct device *dev)
+static int __exit omap_udc_remove(struct platform_device *pdev)
 {
-        struct platform_device  *odev = to_platform_device(dev);
         DECLARE_COMPLETION(done);
 
         if (!udc)
@@ -2891,13 +2889,13 @@ static int __exit omap_udc_remove(struct device *dev)
         remove_proc_file();
 
 #ifdef  USE_ISO
-        free_irq(odev->resource[3].start, udc);
+        free_irq(pdev->resource[3].start, udc);
 #endif
-        free_irq(odev->resource[2].start, udc);
-        free_irq(odev->resource[1].start, udc);
+        free_irq(pdev->resource[2].start, udc);
+        free_irq(pdev->resource[1].start, udc);
 
-        release_mem_region(odev->resource[0].start,
-                        odev->resource[0].end - odev->resource[0].start + 1);
+        release_mem_region(pdev->resource[0].start,
+                        pdev->resource[0].end - pdev->resource[0].start + 1);
 
         device_unregister(&udc->gadget.dev);
         wait_for_completion(&done);
@@ -2915,7 +2913,7 @@ static int __exit omap_udc_remove(struct device *dev)
  * may involve talking to an external transceiver (e.g. isp1301).
  */
 
-static int omap_udc_suspend(struct device *dev, pm_message_t message)
+static int omap_udc_suspend(struct platform_device *dev, pm_message_t message)
 {
         u32     devstat;
 
@@ -2935,7 +2933,7 @@ static int omap_udc_suspend(struct device *dev, pm_message_t message)
         return 0;
 }
 
-static int omap_udc_resume(struct device *dev)
+static int omap_udc_resume(struct platform_device *dev)
 {
         DBG("resume + wakeup/SRP\n");
         omap_pullup(&udc->gadget, 1);
@@ -2947,14 +2945,15 @@ static int omap_udc_resume(struct device *dev)
 
 /*-------------------------------------------------------------------------*/
 
-static struct device_driver udc_driver = {
-        .name           = (char *) driver_name,
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver udc_driver = {
         .probe          = omap_udc_probe,
         .remove         = __exit_p(omap_udc_remove),
         .suspend        = omap_udc_suspend,
         .resume         = omap_udc_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = (char *) driver_name,
+        },
 };
 
 static int __init udc_init(void)
@@ -2965,13 +2964,13 @@ static int __init udc_init(void)
 #endif
                 "%s\n", driver_desc,
                 use_dma ?  " (dma)" : "");
-        return driver_register(&udc_driver);
+        return platform_driver_register(&udc_driver);
 }
 module_init(udc_init);
 
 static void __exit udc_exit(void)
 {
-        driver_unregister(&udc_driver);
+        platform_driver_unregister(&udc_driver);
 }
 module_exit(udc_exit);
 
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 510d28a924db..bb028c5b8952 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -2432,7 +2432,7 @@ static struct pxa2xx_udc memory = {
 /*
  *      probe - binds to the platform device
  */
-static int __init pxa2xx_udc_probe(struct device *_dev)
+static int __init pxa2xx_udc_probe(struct platform_device *pdev)
 {
         struct pxa2xx_udc *dev = &memory;
         int retval, out_dma = 1;
@@ -2495,19 +2495,19 @@ static int __init pxa2xx_udc_probe(struct device *_dev)
 #endif
 
         /* other non-static parts of init */
-        dev->dev = _dev;
-        dev->mach = _dev->platform_data;
+        dev->dev = &pdev->dev;
+        dev->mach = pdev->dev.platform_data;
 
         init_timer(&dev->timer);
         dev->timer.function = udc_watchdog;
         dev->timer.data = (unsigned long) dev;
 
         device_initialize(&dev->gadget.dev);
-        dev->gadget.dev.parent = _dev;
-        dev->gadget.dev.dma_mask = _dev->dma_mask;
+        dev->gadget.dev.parent = &pdev->dev;
+        dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
 
         the_controller = dev;
-        dev_set_drvdata(_dev, dev);
+        platform_set_drvdata(pdev, dev);
 
         udc_disable(dev);
         udc_reinit(dev);
@@ -2559,14 +2559,14 @@ lubbock_fail0:
         return 0;
 }
 
-static void pxa2xx_udc_shutdown(struct device *_dev)
+static void pxa2xx_udc_shutdown(struct platform_device *_dev)
 {
         pullup_off();
 }
 
-static int __exit pxa2xx_udc_remove(struct device *_dev)
+static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
 {
-        struct pxa2xx_udc *dev = dev_get_drvdata(_dev);
+        struct pxa2xx_udc *dev = platform_get_drvdata(pdev);
 
         udc_disable(dev);
         remove_proc_files();
@@ -2580,7 +2580,7 @@ static int __exit pxa2xx_udc_remove(struct device *_dev)
                 free_irq(LUBBOCK_USB_DISC_IRQ, dev);
                 free_irq(LUBBOCK_USB_IRQ, dev);
         }
-        dev_set_drvdata(_dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         the_controller = NULL;
         return 0;
 }
@@ -2601,9 +2601,9 @@ static int __exit pxa2xx_udc_remove(struct device *_dev)
  * VBUS IRQs should probably be ignored so that the PXA device just acts
  * "dead" to USB hosts until system resume.
  */
-static int pxa2xx_udc_suspend(struct device *dev, pm_message_t state)
+static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct pxa2xx_udc       *udc = dev_get_drvdata(dev);
+        struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
 
         if (!udc->mach->udc_command)
                 WARN("USB host won't detect disconnect!\n");
@@ -2612,9 +2612,9 @@ static int pxa2xx_udc_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int pxa2xx_udc_resume(struct device *dev)
+static int pxa2xx_udc_resume(struct platform_device *dev)
 {
-        struct pxa2xx_udc       *udc = dev_get_drvdata(dev);
+        struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
 
         pullup(udc, 1);
 
@@ -2628,27 +2628,28 @@ static int pxa2xx_udc_resume(struct device *dev)
 
 /*-------------------------------------------------------------------------*/
 
-static struct device_driver udc_driver = {
-        .name           = "pxa2xx-udc",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver udc_driver = {
         .probe          = pxa2xx_udc_probe,
         .shutdown       = pxa2xx_udc_shutdown,
         .remove         = __exit_p(pxa2xx_udc_remove),
         .suspend        = pxa2xx_udc_suspend,
         .resume         = pxa2xx_udc_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "pxa2xx-udc",
+        },
 };
 
 static int __init udc_init(void)
 {
         printk(KERN_INFO "%s: version %s\n", driver_name, DRIVER_VERSION);
-        return driver_register(&udc_driver);
+        return platform_driver_register(&udc_driver);
 }
 module_init(udc_init);
 
 static void __exit udc_exit(void)
 {
-        driver_unregister(&udc_driver);
+        platform_driver_unregister(&udc_driver);
 }
 module_exit(udc_exit);
 
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 145008853966..dfd9bd0b1828 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -383,7 +383,6 @@ MODULE_DEVICE_TABLE (pci, pci_ids);
 static struct pci_driver ehci_pci_driver = {
         .name =         (char *) hcd_name,
         .id_table =     pci_ids,
-        .owner =        THIS_MODULE,
 
         .probe =        usb_hcd_pci_probe,
         .remove =       usb_hcd_pci_remove,
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index f9c3f5b8dd1c..82f64986bc22 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1633,17 +1633,15 @@ static struct hc_driver isp116x_hc_driver = {
 
 /*----------------------------------------------------------------*/
 
-static int __init_or_module isp116x_remove(struct device *dev)
+static int __init_or_module isp116x_remove(struct platform_device *pdev)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
         struct isp116x *isp116x;
-        struct platform_device *pdev;
         struct resource *res;
 
         if (!hcd)
                 return 0;
         isp116x = hcd_to_isp116x(hcd);
-        pdev = container_of(dev, struct platform_device, dev);
         remove_debug_file(isp116x);
         usb_remove_hcd(hcd);
 
@@ -1660,18 +1658,16 @@ static int __init_or_module isp116x_remove(struct device *dev)
 
 #define resource_len(r) (((r)->end - (r)->start) + 1)
 
-static int __init isp116x_probe(struct device *dev)
+static int __init isp116x_probe(struct platform_device *pdev)
 {
         struct usb_hcd *hcd;
         struct isp116x *isp116x;
-        struct platform_device *pdev;
         struct resource *addr, *data;
         void __iomem *addr_reg;
         void __iomem *data_reg;
         int irq;
         int ret = 0;
 
-        pdev = container_of(dev, struct platform_device, dev);
         if (pdev->num_resources < 3) {
                 ret = -ENODEV;
                 goto err1;
@@ -1685,7 +1681,7 @@ static int __init isp116x_probe(struct device *dev)
                 goto err1;
         }
 
-        if (dev->dma_mask) {
+        if (pdev->dev.dma_mask) {
                 DBG("DMA not supported\n");
                 ret = -EINVAL;
                 goto err1;
@@ -1711,7 +1707,7 @@ static int __init isp116x_probe(struct device *dev)
         }
 
         /* allocate and initialize hcd */
-        hcd = usb_create_hcd(&isp116x_hc_driver, dev, dev->bus_id);
+        hcd = usb_create_hcd(&isp116x_hc_driver, &pdev->dev, pdev->dev.bus_id);
         if (!hcd) {
                 ret = -ENOMEM;
                 goto err5;
@@ -1723,7 +1719,7 @@ static int __init isp116x_probe(struct device *dev)
         isp116x->addr_reg = addr_reg;
         spin_lock_init(&isp116x->lock);
         INIT_LIST_HEAD(&isp116x->async);
-        isp116x->board = dev->platform_data;
+        isp116x->board = pdev->dev.platform_data;
 
         if (!isp116x->board) {
                 ERR("Platform data structure not initialized\n");
@@ -1764,13 +1760,13 @@ static int __init isp116x_probe(struct device *dev)
 /*
   Suspend of platform device
 */
-static int isp116x_suspend(struct device *dev, pm_message_t state)
+static int isp116x_suspend(struct platform_device *dev, pm_message_t state)
 {
         int ret = 0;
 
         VDBG("%s: state %x\n", __func__, state);
 
-        dev->power.power_state = state;
+        dev->dev.power.power_state = state;
 
         return ret;
 }
@@ -1778,13 +1774,13 @@ static int isp116x_suspend(struct device *dev, pm_message_t state)
 /*
   Resume platform device
 */
-static int isp116x_resume(struct device *dev)
+static int isp116x_resume(struct platform_device *dev)
 {
         int ret = 0;
 
-        VDBG("%s:  state %x\n", __func__, dev->power.power_state);
+        VDBG("%s:  state %x\n", __func__, dev->dev.power.power_state);
 
-        dev->power.power_state = PMSG_ON;
+        dev->dev.power.power_state = PMSG_ON;
 
         return ret;
 }
@@ -1796,13 +1792,14 @@ static int isp116x_resume(struct device *dev)
 
 #endif
 
-static struct device_driver isp116x_driver = {
-        .name = (char *)hcd_name,
-        .bus = &platform_bus_type,
+static struct platform_driver isp116x_driver = {
         .probe = isp116x_probe,
         .remove = isp116x_remove,
         .suspend = isp116x_suspend,
         .resume = isp116x_resume,
+        .driver = {
+                .name = (char *)hcd_name,
+        },
 };
 
 /*-----------------------------------------------------------------*/
@@ -1813,14 +1810,14 @@ static int __init isp116x_init(void)
                 return -ENODEV;
 
         INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION);
-        return driver_register(&isp116x_driver);
+        return platform_driver_register(&isp116x_driver);
 }
 
 module_init(isp116x_init);
 
 static void __exit isp116x_cleanup(void)
 {
-        driver_unregister(&isp116x_driver);
+        platform_driver_unregister(&isp116x_driver);
 }
 
 module_exit(isp116x_cleanup);
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index f0c78cf14b6c..d9cf3b327d96 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -225,9 +225,8 @@ static const struct hc_driver ohci_au1xxx_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-static int ohci_hcd_au1xxx_drv_probe(struct device *dev)
+static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         int ret;
 
         pr_debug ("In ohci_hcd_au1xxx_drv_probe");
@@ -239,39 +238,37 @@ static int ohci_hcd_au1xxx_drv_probe(struct device *dev)
         return ret;
 }
 
-static int ohci_hcd_au1xxx_drv_remove(struct device *dev)
+static int ohci_hcd_au1xxx_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
         usb_hcd_au1xxx_remove(hcd, pdev);
         return 0;
 }
         /*TBD*/
-/*static int ohci_hcd_au1xxx_drv_suspend(struct device *dev)
+/*static int ohci_hcd_au1xxx_drv_suspend(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
         return 0;
 }
-static int ohci_hcd_au1xxx_drv_resume(struct device *dev)
+static int ohci_hcd_au1xxx_drv_resume(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
         return 0;
 }
 */
 
-static struct device_driver ohci_hcd_au1xxx_driver = {
-        .name           = "au1xxx-ohci",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_au1xxx_driver = {
         .probe          = ohci_hcd_au1xxx_drv_probe,
         .remove         = ohci_hcd_au1xxx_drv_remove,
         /*.suspend      = ohci_hcd_au1xxx_drv_suspend, */
         /*.resume       = ohci_hcd_au1xxx_drv_resume, */
+        .driver         = {
+                .name   = "au1xxx-ohci",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init ohci_hcd_au1xxx_init (void)
@@ -280,12 +277,12 @@ static int __init ohci_hcd_au1xxx_init (void)
         pr_debug ("block sizes: ed %d td %d\n",
                 sizeof (struct ed), sizeof (struct td));
 
-        return driver_register(&ohci_hcd_au1xxx_driver);
+        return platform_driver_register(&ohci_hcd_au1xxx_driver);
 }
 
 static void __exit ohci_hcd_au1xxx_cleanup (void)
 {
-        driver_unregister(&ohci_hcd_au1xxx_driver);
+        platform_driver_unregister(&ohci_hcd_au1xxx_driver);
 }
 
 module_init (ohci_hcd_au1xxx_init);
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c
index 336c766c6e29..081ec3f5cff4 100644
--- a/drivers/usb/host/ohci-lh7a404.c
+++ b/drivers/usb/host/ohci-lh7a404.c
@@ -204,9 +204,8 @@ static const struct hc_driver ohci_lh7a404_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-static int ohci_hcd_lh7a404_drv_probe(struct device *dev)
+static int ohci_hcd_lh7a404_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         int ret;
 
         pr_debug ("In ohci_hcd_lh7a404_drv_probe");
@@ -218,40 +217,38 @@ static int ohci_hcd_lh7a404_drv_probe(struct device *dev)
         return ret;
 }
 
-static int ohci_hcd_lh7a404_drv_remove(struct device *dev)
+static int ohci_hcd_lh7a404_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
         usb_hcd_lh7a404_remove(hcd, pdev);
         return 0;
 }
         /*TBD*/
-/*static int ohci_hcd_lh7a404_drv_suspend(struct device *dev)
+/*static int ohci_hcd_lh7a404_drv_suspend(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
         return 0;
 }
-static int ohci_hcd_lh7a404_drv_resume(struct device *dev)
+static int ohci_hcd_lh7a404_drv_resume(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
 
         return 0;
 }
 */
 
-static struct device_driver ohci_hcd_lh7a404_driver = {
-        .name           = "lh7a404-ohci",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_lh7a404_driver = {
         .probe          = ohci_hcd_lh7a404_drv_probe,
         .remove         = ohci_hcd_lh7a404_drv_remove,
         /*.suspend      = ohci_hcd_lh7a404_drv_suspend, */
         /*.resume       = ohci_hcd_lh7a404_drv_resume, */
+        .driver         = {
+                .name   = "lh7a404-ohci",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init ohci_hcd_lh7a404_init (void)
@@ -260,12 +257,12 @@ static int __init ohci_hcd_lh7a404_init (void)
         pr_debug ("block sizes: ed %d td %d\n",
                 sizeof (struct ed), sizeof (struct td));
 
-        return driver_register(&ohci_hcd_lh7a404_driver);
+        return platform_driver_register(&ohci_hcd_lh7a404_driver);
 }
 
 static void __exit ohci_hcd_lh7a404_cleanup (void)
 {
-        driver_unregister(&ohci_hcd_lh7a404_driver);
+        platform_driver_unregister(&ohci_hcd_lh7a404_driver);
 }
 
 module_init (ohci_hcd_lh7a404_init);
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index e46cc540cf4d..c9e29d808711 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -433,24 +433,22 @@ static const struct hc_driver ohci_omap_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-static int ohci_hcd_omap_drv_probe(struct device *dev)
+static int ohci_hcd_omap_drv_probe(struct platform_device *dev)
 {
-        return usb_hcd_omap_probe(&ohci_omap_hc_driver,
-                                to_platform_device(dev));
+        return usb_hcd_omap_probe(&ohci_omap_hc_driver, dev);
 }
 
-static int ohci_hcd_omap_drv_remove(struct device *dev)
+static int ohci_hcd_omap_drv_remove(struct platform_device *dev)
 {
-        struct platform_device  *pdev = to_platform_device(dev);
-        struct usb_hcd          *hcd = dev_get_drvdata(dev);
+        struct usb_hcd          *hcd = platform_get_drvdata(dev);
         struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
 
-        usb_hcd_omap_remove(hcd, pdev);
+        usb_hcd_omap_remove(hcd, dev);
         if (ohci->transceiver) {
                 (void) otg_set_host(ohci->transceiver, 0);
                 put_device(ohci->transceiver->dev);
         }
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         return 0;
 }
@@ -459,9 +457,9 @@ static int ohci_hcd_omap_drv_remove(struct device *dev)
 
 #ifdef  CONFIG_PM
 
-static int ohci_omap_suspend(struct device *dev, pm_message_t message)
+static int ohci_omap_suspend(struct platform_device *dev, pm_message_t message)
 {
-        struct ohci_hcd *ohci = hcd_to_ohci(dev_get_drvdata(dev));
+        struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(dev));
 
         if (time_before(jiffies, ohci->next_statechange))
                 msleep(5);
@@ -473,9 +471,9 @@ static int ohci_omap_suspend(struct device *dev, pm_message_t message)
         return 0;
 }
 
-static int ohci_omap_resume(struct device *dev)
+static int ohci_omap_resume(struct platform_device *dev)
 {
-        struct ohci_hcd *ohci = hcd_to_ohci(dev_get_drvdata(dev));
+        struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(dev));
 
         if (time_before(jiffies, ohci->next_statechange))
                 msleep(5);
@@ -494,16 +492,17 @@ static int ohci_omap_resume(struct device *dev)
 /*
  * Driver definition to register with the OMAP bus
  */
-static struct device_driver ohci_hcd_omap_driver = {
-        .name           = "ohci",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_omap_driver = {
         .probe          = ohci_hcd_omap_drv_probe,
         .remove         = ohci_hcd_omap_drv_remove,
 #ifdef  CONFIG_PM
         .suspend        = ohci_omap_suspend,
         .resume         = ohci_omap_resume,
 #endif
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "ohci",
+        },
 };
 
 static int __init ohci_hcd_omap_init (void)
@@ -515,12 +514,12 @@ static int __init ohci_hcd_omap_init (void)
         pr_debug("%s: block sizes: ed %Zd td %Zd\n", hcd_name,
                 sizeof (struct ed), sizeof (struct td));
 
-        return driver_register(&ohci_hcd_omap_driver);
+        return platform_driver_register(&ohci_hcd_omap_driver);
 }
 
 static void __exit ohci_hcd_omap_cleanup (void)
 {
-        driver_unregister(&ohci_hcd_omap_driver);
+        platform_driver_unregister(&ohci_hcd_omap_driver);
 }
 
 module_init (ohci_hcd_omap_init);
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 7ce1d9ef0289..a59e536441e1 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -218,7 +218,6 @@ MODULE_DEVICE_TABLE (pci, pci_ids);
 static struct pci_driver ohci_pci_driver = {
         .name =         (char *) hcd_name,
         .id_table =     pci_ids,
-        .owner =        THIS_MODULE,
 
         .probe =        usb_hcd_pci_probe,
         .remove =       usb_hcd_pci_remove,
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c
index 92cf6f4a1374..18755766e406 100644
--- a/drivers/usb/host/ohci-ppc-soc.c
+++ b/drivers/usb/host/ohci-ppc-soc.c
@@ -172,9 +172,8 @@ static const struct hc_driver ohci_ppc_soc_hc_driver = {
         .start_port_reset =     ohci_start_port_reset,
 };
 
-static int ohci_hcd_ppc_soc_drv_probe(struct device *dev)
+static int ohci_hcd_ppc_soc_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         int ret;
 
         if (usb_disabled())
@@ -184,25 +183,25 @@ static int ohci_hcd_ppc_soc_drv_probe(struct device *dev)
         return ret;
 }
 
-static int ohci_hcd_ppc_soc_drv_remove(struct device *dev)
+static int ohci_hcd_ppc_soc_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
         usb_hcd_ppc_soc_remove(hcd, pdev);
         return 0;
 }
 
-static struct device_driver ohci_hcd_ppc_soc_driver = {
-        .name           = "ppc-soc-ohci",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_ppc_soc_driver = {
         .probe          = ohci_hcd_ppc_soc_drv_probe,
         .remove         = ohci_hcd_ppc_soc_drv_remove,
 #ifdef  CONFIG_PM
         /*.suspend      = ohci_hcd_ppc_soc_drv_suspend,*/
         /*.resume       = ohci_hcd_ppc_soc_drv_resume,*/
 #endif
+        .driver         = {
+                .name   = "ppc-soc-ohci",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init ohci_hcd_ppc_soc_init(void)
@@ -211,12 +210,12 @@ static int __init ohci_hcd_ppc_soc_init(void)
         pr_debug("block sizes: ed %d td %d\n", sizeof(struct ed),
                                                         sizeof(struct td));
 
-        return driver_register(&ohci_hcd_ppc_soc_driver);
+        return platform_driver_register(&ohci_hcd_ppc_soc_driver);
 }
 
 static void __exit ohci_hcd_ppc_soc_cleanup(void)
 {
-        driver_unregister(&ohci_hcd_ppc_soc_driver);
+        platform_driver_unregister(&ohci_hcd_ppc_soc_driver);
 }
 
 module_init(ohci_hcd_ppc_soc_init);
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 59e20568e8f9..9d65ec307990 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -290,9 +290,8 @@ static const struct hc_driver ohci_pxa27x_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-static int ohci_hcd_pxa27x_drv_probe(struct device *dev)
+static int ohci_hcd_pxa27x_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         int ret;
 
         pr_debug ("In ohci_hcd_pxa27x_drv_probe");
@@ -304,41 +303,39 @@ static int ohci_hcd_pxa27x_drv_probe(struct device *dev)
         return ret;
 }
 
-static int ohci_hcd_pxa27x_drv_remove(struct device *dev)
+static int ohci_hcd_pxa27x_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
         usb_hcd_pxa27x_remove(hcd, pdev);
         return 0;
 }
 
-static int ohci_hcd_pxa27x_drv_suspend(struct device *dev, pm_message_t state)
+static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *dev, pm_message_t state)
 {
-//      struct platform_device *pdev = to_platform_device(dev);
-//      struct usb_hcd *hcd = dev_get_drvdata(dev);
+//      struct usb_hcd *hcd = platform_get_drvdata(dev);
         printk("%s: not implemented yet\n", __FUNCTION__);
 
         return 0;
 }
 
-static int ohci_hcd_pxa27x_drv_resume(struct device *dev)
+static int ohci_hcd_pxa27x_drv_resume(struct platform_device *dev)
 {
-//      struct platform_device *pdev = to_platform_device(dev);
-//      struct usb_hcd *hcd = dev_get_drvdata(dev);
+//      struct usb_hcd *hcd = platform_get_drvdata(dev);
         printk("%s: not implemented yet\n", __FUNCTION__);
 
         return 0;
 }
 
 
-static struct device_driver ohci_hcd_pxa27x_driver = {
-        .name           = "pxa27x-ohci",
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_pxa27x_driver = {
         .probe          = ohci_hcd_pxa27x_drv_probe,
         .remove         = ohci_hcd_pxa27x_drv_remove,
         .suspend        = ohci_hcd_pxa27x_drv_suspend, 
-        .resume         = ohci_hcd_pxa27x_drv_resume, 
+        .resume         = ohci_hcd_pxa27x_drv_resume,
+        .driver         = {
+                .name   = "pxa27x-ohci",
+        },
 };
 
 static int __init ohci_hcd_pxa27x_init (void)
@@ -347,12 +344,12 @@ static int __init ohci_hcd_pxa27x_init (void)
         pr_debug ("block sizes: ed %d td %d\n",
                 sizeof (struct ed), sizeof (struct td));
 
-        return driver_register(&ohci_hcd_pxa27x_driver);
+        return platform_driver_register(&ohci_hcd_pxa27x_driver);
 }
 
 static void __exit ohci_hcd_pxa27x_cleanup (void)
 {
-        driver_unregister(&ohci_hcd_pxa27x_driver);
+        platform_driver_unregister(&ohci_hcd_pxa27x_driver);
 }
 
 module_init (ohci_hcd_pxa27x_init);
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index ee1fc605b402..35cc9402adc0 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -459,39 +459,38 @@ static const struct hc_driver ohci_s3c2410_hc_driver = {
 
 /* device driver */
 
-static int ohci_hcd_s3c2410_drv_probe(struct device *dev)
+static int ohci_hcd_s3c2410_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         return usb_hcd_s3c2410_probe(&ohci_s3c2410_hc_driver, pdev);
 }
 
-static int ohci_hcd_s3c2410_drv_remove(struct device *dev)
+static int ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
         usb_hcd_s3c2410_remove(hcd, pdev);
         return 0;
 }
 
-static struct device_driver ohci_hcd_s3c2410_driver = {
-        .name           = "s3c2410-ohci",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_s3c2410_driver = {
         .probe          = ohci_hcd_s3c2410_drv_probe,
         .remove         = ohci_hcd_s3c2410_drv_remove,
         /*.suspend      = ohci_hcd_s3c2410_drv_suspend, */
         /*.resume       = ohci_hcd_s3c2410_drv_resume, */
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "s3c2410-ohci",
+        },
 };
 
 static int __init ohci_hcd_s3c2410_init (void)
 {
-        return driver_register(&ohci_hcd_s3c2410_driver);
+        return platform_driver_register(&ohci_hcd_s3c2410_driver);
 }
 
 static void __exit ohci_hcd_s3c2410_cleanup (void)
 {
-        driver_unregister(&ohci_hcd_s3c2410_driver);
+        platform_driver_unregister(&ohci_hcd_s3c2410_driver);
 }
 
 module_init (ohci_hcd_s3c2410_init);
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 5607c0ae6835..a7722a6a5a5b 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1631,24 +1631,21 @@ static struct hc_driver sl811h_hc_driver = {
 /*-------------------------------------------------------------------------*/
 
 static int __devexit
-sl811h_remove(struct device *dev)
+sl811h_remove(struct platform_device *dev)
 {
-        struct usb_hcd          *hcd = dev_get_drvdata(dev);
+        struct usb_hcd          *hcd = platform_get_drvdata(dev);
         struct sl811            *sl811 = hcd_to_sl811(hcd);
-        struct platform_device  *pdev;
         struct resource         *res;
 
-        pdev = container_of(dev, struct platform_device, dev);
-
         remove_debug_file(sl811);
         usb_remove_hcd(hcd);
 
         /* some platforms may use IORESOURCE_IO */
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        res = platform_get_resource(dev, IORESOURCE_MEM, 1);
         if (res)
                 iounmap(sl811->data_reg);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
         if (res)
                 iounmap(sl811->addr_reg);
 
@@ -1657,11 +1654,10 @@ sl811h_remove(struct device *dev)
 }
 
 static int __devinit
-sl811h_probe(struct device *dev)
+sl811h_probe(struct platform_device *dev)
 {
         struct usb_hcd          *hcd;
         struct sl811            *sl811;
-        struct platform_device  *pdev;
         struct resource         *addr, *data;
         int                     irq;
         void __iomem            *addr_reg;
@@ -1674,24 +1670,23 @@ sl811h_probe(struct device *dev)
          * specific platform_data.  we don't probe for IRQs, and do only
          * minimal sanity checking.
          */
-        pdev = container_of(dev, struct platform_device, dev);
-        irq = platform_get_irq(pdev, 0);
-        if (pdev->num_resources < 3 || irq < 0)
+        irq = platform_get_irq(dev, 0);
+        if (dev->num_resources < 3 || irq < 0)
                 return -ENODEV;
 
         /* refuse to confuse usbcore */
-        if (dev->dma_mask) {
+        if (dev->dev.dma_mask) {
                 DBG("no we won't dma\n");
                 return -EINVAL;
         }
 
         /* the chip may be wired for either kind of addressing */
-        addr = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        data = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        addr = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        data = platform_get_resource(dev, IORESOURCE_MEM, 1);
         retval = -EBUSY;
         if (!addr || !data) {
-                addr = platform_get_resource(pdev, IORESOURCE_IO, 0);
-                data = platform_get_resource(pdev, IORESOURCE_IO, 1);
+                addr = platform_get_resource(dev, IORESOURCE_IO, 0);
+                data = platform_get_resource(dev, IORESOURCE_IO, 1);
                 if (!addr || !data)
                         return -ENODEV;
                 ioaddr = 1;
@@ -1713,7 +1708,7 @@ sl811h_probe(struct device *dev)
         }
 
         /* allocate and initialize hcd */
-        hcd = usb_create_hcd(&sl811h_hc_driver, dev, dev->bus_id);
+        hcd = usb_create_hcd(&sl811h_hc_driver, &dev->dev, dev->dev.bus_id);
         if (!hcd) {
                 retval = -ENOMEM;
                 goto err5;
@@ -1723,7 +1718,7 @@ sl811h_probe(struct device *dev)
 
         spin_lock_init(&sl811->lock);
         INIT_LIST_HEAD(&sl811->async);
-        sl811->board = dev->platform_data;
+        sl811->board = dev->dev.platform_data;
         init_timer(&sl811->timer);
         sl811->timer.function = sl811h_timer;
         sl811->timer.data = (unsigned long) sl811;
@@ -1785,9 +1780,9 @@ sl811h_probe(struct device *dev)
  */
 
 static int
-sl811h_suspend(struct device *dev, pm_message_t state)
+sl811h_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct usb_hcd  *hcd = dev_get_drvdata(dev);
+        struct usb_hcd  *hcd = platform_get_drvdata(dev);
         struct sl811    *sl811 = hcd_to_sl811(hcd);
         int             retval = 0;
 
@@ -1796,27 +1791,27 @@ sl811h_suspend(struct device *dev, pm_message_t state)
         else if (state.event == PM_EVENT_SUSPEND)
                 port_power(sl811, 0);
         if (retval == 0)
-                dev->power.power_state = state;
+                dev->dev.power.power_state = state;
         return retval;
 }
 
 static int
-sl811h_resume(struct device *dev)
+sl811h_resume(struct platform_device *dev)
 {
-        struct usb_hcd  *hcd = dev_get_drvdata(dev);
+        struct usb_hcd  *hcd = platform_get_drvdata(dev);
         struct sl811    *sl811 = hcd_to_sl811(hcd);
 
         /* with no "check to see if VBUS is still powered" board hook,
          * let's assume it'd only be powered to enable remote wakeup.
          */
-        if (dev->power.power_state.event == PM_EVENT_SUSPEND
+        if (dev->dev.power.power_state.event == PM_EVENT_SUSPEND
                         || !hcd->can_wakeup) {
                 sl811->port1 = 0;
                 port_power(sl811, 1);
                 return 0;
         }
 
-        dev->power.power_state = PMSG_ON;
+        dev->dev.power.power_state = PMSG_ON;
         return sl811h_bus_resume(hcd);
 }
 
@@ -1829,16 +1824,16 @@ sl811h_resume(struct device *dev)
 
 
 /* this driver is exported so sl811_cs can depend on it */
-struct device_driver sl811h_driver = {
-        .name =         (char *) hcd_name,
-        .bus =          &platform_bus_type,
-        .owner =        THIS_MODULE,
-
+struct platform_driver sl811h_driver = {
         .probe =        sl811h_probe,
         .remove =       __devexit_p(sl811h_remove),
 
         .suspend =      sl811h_suspend,
         .resume =       sl811h_resume,
+        .driver = {
+                .name = (char *) hcd_name,
+                .owner = THIS_MODULE,
+        },
 };
 EXPORT_SYMBOL(sl811h_driver);
 
@@ -1850,12 +1845,12 @@ static int __init sl811h_init(void)
                 return -ENODEV;
 
         INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION);
-        return driver_register(&sl811h_driver);
+        return platform_driver_register(&sl811h_driver);
 }
 module_init(sl811h_init);
 
 static void __exit sl811h_cleanup(void)
 {
-        driver_unregister(&sl811h_driver);
+        platform_driver_unregister(&sl811h_driver);
 }
 module_exit(sl811h_cleanup);
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 15e0a511069b..d33ce3982a5f 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -831,7 +831,6 @@ MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
 static struct pci_driver uhci_pci_driver = {
         .name =         (char *)hcd_name,
         .id_table =     uhci_pci_ids,
-        .owner =        THIS_MODULE,
 
         .probe =        usb_hcd_pci_probe,
         .remove =       usb_hcd_pci_remove,
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 193b482570c7..750cebb18306 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -1279,7 +1279,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
         printk("acornfb: freed %dK memory\n", mb_freed);
 }
 
-static int __init acornfb_probe(struct device *dev)
+static int __init acornfb_probe(struct platform_device *dev)
 {
         unsigned long size;
         u_int h_sync, v_sync;
@@ -1292,7 +1292,7 @@ static int __init acornfb_probe(struct device *dev)
 
         acornfb_init_fbinfo();
 
-        current_par.dev = dev;
+        current_par.dev = &dev->dev;
 
         if (current_par.montype == -1)
                 current_par.montype = acornfb_detect_monitortype();
@@ -1453,15 +1453,16 @@ static int __init acornfb_probe(struct device *dev)
         return 0;
 }
 
-static struct device_driver acornfb_driver = {
-        .name   = "acornfb",
-        .bus    = &platform_bus_type,
+static struct platform_driver acornfb_driver = {
         .probe  = acornfb_probe,
+        .driver = {
+                .name   = "acornfb",
+        },
 };
 
 static int __init acornfb_init(void)
 {
-        return driver_register(&acornfb_driver);
+        return platform_driver_register(&acornfb_driver);
 }
 
 module_init(acornfb_init);
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index a1fc8bbb1090..080db812ca48 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -514,9 +514,8 @@ static struct fb_ops arcfb_ops = {
         .fb_ioctl       = arcfb_ioctl,
 };
 
-static int __init arcfb_probe(struct device *device)
+static int __init arcfb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
         int retval = -ENOMEM;
         int videomemorysize;
@@ -559,7 +558,7 @@ static int __init arcfb_probe(struct device *device)
         retval = register_framebuffer(info);
         if (retval < 0)
                 goto err1;
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
         if (irq) {
                 par->irq = irq;
                 if (request_irq(par->irq, &arcfb_interrupt, SA_SHIRQ,
@@ -600,9 +599,9 @@ err:
         return retval;
 }
 
-static int arcfb_remove(struct device *device)
+static int arcfb_remove(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(device);
+        struct fb_info *info = platform_get_drvdata(dev);
 
         if (info) {
                 unregister_framebuffer(info);
@@ -612,11 +611,12 @@ static int arcfb_remove(struct device *device)
         return 0;
 }
 
-static struct device_driver arcfb_driver = {
-        .name   = "arcfb",
-        .bus    = &platform_bus_type,
+static struct platform_driver arcfb_driver = {
         .probe  = arcfb_probe,
         .remove = arcfb_remove,
+        .driver = {
+                .name   = "arcfb",
+        },
 };
 
 static struct platform_device *arcfb_device;
@@ -628,7 +628,7 @@ static int __init arcfb_init(void)
         if (!arcfb_enable)
                 return -ENXIO;
 
-        ret = driver_register(&arcfb_driver);
+        ret = platform_driver_register(&arcfb_driver);
         if (!ret) {
                 arcfb_device = platform_device_alloc("arcfb", 0);
                 if (arcfb_device) {
@@ -638,7 +638,7 @@ static int __init arcfb_init(void)
                 }
                 if (ret) {
                         platform_device_put(arcfb_device);
-                        driver_unregister(&arcfb_driver);
+                        platform_driver_unregister(&arcfb_driver);
                 }
         }
         return ret;
@@ -648,7 +648,7 @@ static int __init arcfb_init(void)
 static void __exit arcfb_exit(void)
 {
         platform_device_unregister(arcfb_device);
-        driver_unregister(&arcfb_driver);
+        platform_driver_unregister(&arcfb_driver);
 }
 
 module_param(num_cols, ulong, 0);
diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 4867498f68e8..6a219b2c77e3 100644
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -48,6 +48,12 @@ static void corgibl_send_intensity(int intensity)
         corgibl_mach_set_intensity(intensity);
 
         spin_unlock_irqrestore(&bl_lock, flags);
+
+        corgi_kick_batt = symbol_get(sharpsl_battery_kick);
+        if (corgi_kick_batt) {
+                corgi_kick_batt();
+                symbol_put(sharpsl_battery_kick);
+        }
 }
 
 static void corgibl_blank(int blank)
@@ -73,13 +79,13 @@ static void corgibl_blank(int blank)
 }
 
 #ifdef CONFIG_PM
-static int corgibl_suspend(struct device *dev, pm_message_t state)
+static int corgibl_suspend(struct platform_device *dev, pm_message_t state)
 {
         corgibl_blank(FB_BLANK_POWERDOWN);
         return 0;
 }
 
-static int corgibl_resume(struct device *dev)
+static int corgibl_resume(struct platform_device *dev)
 {
         corgibl_blank(FB_BLANK_UNBLANK);
         return 0;
@@ -137,9 +143,9 @@ static struct backlight_properties corgibl_data = {
 
 static struct backlight_device *corgi_backlight_device;
 
-static int __init corgibl_probe(struct device *dev)
+static int __init corgibl_probe(struct platform_device *pdev)
 {
-        struct corgibl_machinfo *machinfo = dev->platform_data;
+        struct corgibl_machinfo *machinfo = pdev->dev.platform_data;
 
         corgibl_data.max_brightness = machinfo->max_intensity;
         corgibl_mach_set_intensity = machinfo->set_bl_intensity;
@@ -156,7 +162,7 @@ static int __init corgibl_probe(struct device *dev)
         return 0;
 }
 
-static int corgibl_remove(struct device *dev)
+static int corgibl_remove(struct platform_device *dev)
 {
         backlight_device_unregister(corgi_backlight_device);
 
@@ -166,23 +172,24 @@ static int corgibl_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver corgibl_driver = {
-        .name           = "corgi-bl",
-        .bus            = &platform_bus_type,
+static struct platform_driver corgibl_driver = {
         .probe          = corgibl_probe,
         .remove         = corgibl_remove,
         .suspend        = corgibl_suspend,
         .resume         = corgibl_resume,
+        .driver         = {
+                .name   = "corgi-bl",
+        },
 };
 
 static int __init corgibl_init(void)
 {
-        return driver_register(&corgibl_driver);
+        return platform_driver_register(&corgibl_driver);
 }
 
 static void __exit corgibl_exit(void)
 {
-        driver_unregister(&corgibl_driver);
+        platform_driver_unregister(&corgibl_driver);
 }
 
 module_init(corgibl_init);
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index 957a3ada2b75..5abd3cb00671 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -227,9 +227,8 @@ void dnfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
  * Initialization
  */
 
-static int __devinit dnfb_probe(struct device *device)
+static int __devinit dnfb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
         int err = 0;
 
@@ -257,7 +256,7 @@ static int __devinit dnfb_probe(struct device *device)
                 framebuffer_release(info);
                 return err;
         }
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         /* now we have registered we can safely setup the hardware */
         out_8(AP_CONTROL_3A, RESET_CREG);
@@ -271,10 +270,11 @@ static int __devinit dnfb_probe(struct device *device)
         return err;
 }
 
-static struct device_driver dnfb_driver = {
-        .name   = "dnfb",
-        .bus    = &platform_bus_type,
+static struct platform_driver dnfb_driver = {
         .probe  = dnfb_probe,
+        .driver = {
+                .name   = "dnfb",
+        },
 };
 
 static struct platform_device dnfb_device = {
@@ -288,12 +288,12 @@ int __init dnfb_init(void)
         if (fb_get_options("dnfb", NULL))
                 return -ENODEV;
 
-        ret = driver_register(&dnfb_driver);
+        ret = platform_driver_register(&dnfb_driver);
 
         if (!ret) {
                 ret = platform_device_register(&dnfb_device);
                 if (ret)
-                        driver_unregister(&dnfb_driver);
+                        platform_driver_unregister(&dnfb_driver);
         }
         return ret;
 }
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 6a81a1dd8f3d..3b0e71383448 100644
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -609,9 +609,9 @@ static void epson1355fb_platform_release(struct device *device)
 {
 }
 
-static int epson1355fb_remove(struct device *device)
+static int epson1355fb_remove(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(device);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct epson1355_par *par = info->par;
 
         backlight_enable(0);
@@ -632,9 +632,8 @@ static int epson1355fb_remove(struct device *device)
         return 0;
 }
 
-int __init epson1355fb_probe(struct device *device)
+int __init epson1355fb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct epson1355_par *default_par;
         struct fb_info *info;
         u8 revision;
@@ -713,7 +712,7 @@ int __init epson1355fb_probe(struct device *device)
         /*
          * Our driver data.
          */
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                info->node, info->fix.id);
@@ -721,15 +720,16 @@ int __init epson1355fb_probe(struct device *device)
         return 0;
 
       bail:
-        epson1355fb_remove(device);
+        epson1355fb_remove(dev);
         return rc;
 }
 
-static struct device_driver epson1355fb_driver = {
-        .name   = "epson1355fb",
-        .bus    = &platform_bus_type,
+static struct platform_driver epson1355fb_driver = {
         .probe  = epson1355fb_probe,
         .remove = epson1355fb_remove,
+        .driver = {
+                .name   = "epson1355fb",
+        },
 };
 
 static struct platform_device epson1355fb_device = {
@@ -747,11 +747,11 @@ int __init epson1355fb_init(void)
         if (fb_get_options("epson1355fb", NULL))
                 return -ENODEV;
 
-        ret = driver_register(&epson1355fb_driver);
+        ret = platform_driver_register(&epson1355fb_driver);
         if (!ret) {
                 ret = platform_device_register(&epson1355fb_device);
                 if (ret)
-                        driver_unregister(&epson1355fb_driver);
+                        platform_driver_unregister(&epson1355fb_driver);
         }
         return ret;
 }
@@ -762,7 +762,7 @@ module_init(epson1355fb_init);
 static void __exit epson1355fb_exit(void)
 {
         platform_device_unregister(&epson1355fb_device);
-        driver_unregister(&epson1355fb_driver);
+        platform_driver_unregister(&epson1355fb_driver);
 }
 
 /* ------------------------------------------------------------------------- */
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 9d5e4f342110..d744c51807b7 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -1105,12 +1105,11 @@ int __init gbefb_setup(char *options)
         return 0;
 }
 
-static int __init gbefb_probe(struct device *dev)
+static int __init gbefb_probe(struct platform_device *p_dev)
 {
         int i, ret = 0;
         struct fb_info *info;
         struct gbefb_par *par;
-        struct platform_device *p_dev = to_platform_device(dev);
 #ifndef MODULE
         char *options = NULL;
 #endif
@@ -1204,8 +1203,8 @@ static int __init gbefb_probe(struct device *dev)
                 goto out_gbe_unmap;
         }
 
-        dev_set_drvdata(&p_dev->dev, info);
-        gbefb_create_sysfs(dev);
+        platform_set_drvdata(p_dev, info);
+        gbefb_create_sysfs(&p_dev->dev);
 
         printk(KERN_INFO "fb%d: %s rev %d @ 0x%08x using %dkB memory\n",
                info->node, info->fix.id, gbe_revision, (unsigned) GBE_BASE,
@@ -1231,10 +1230,9 @@ out_release_framebuffer:
         return ret;
 }
 
-static int __devexit gbefb_remove(struct device* dev)
+static int __devexit gbefb_remove(struct platform_device* p_dev)
 {
-        struct platform_device *p_dev = to_platform_device(dev);
-        struct fb_info *info = dev_get_drvdata(&p_dev->dev);
+        struct fb_info *info = platform_get_drvdata(p_dev);
 
         unregister_framebuffer(info);
         gbe_turn_off();
@@ -1252,18 +1250,19 @@ static int __devexit gbefb_remove(struct device* dev)
         return 0;
 }
 
-static struct device_driver gbefb_driver = {
-        .name = "gbefb",
-        .bus = &platform_bus_type,
+static struct platform_driver gbefb_driver = {
         .probe = gbefb_probe,
         .remove = __devexit_p(gbefb_remove),
+        .driver = {
+                .name = "gbefb",
+        },
 };
 
 static struct platform_device *gbefb_device;
 
 int __init gbefb_init(void)
 {
-        int ret = driver_register(&gbefb_driver);
+        int ret = platform_driver_register(&gbefb_driver);
         if (!ret) {
                 gbefb_device = platform_device_alloc("gbefb", 0);
                 if (gbefb_device) {
@@ -1273,7 +1272,7 @@ int __init gbefb_init(void)
                 }
                 if (ret) {
                         platform_device_put(gbefb_device);
-                        driver_unregister(&gbefb_driver);
+                        platform_driver_unregister(&gbefb_driver);
                 }
         }
         return ret;
@@ -1282,7 +1281,7 @@ int __init gbefb_init(void)
 void __exit gbefb_exit(void)
 {
         platform_device_unregister(gbefb_device);
-        driver_unregister(&gbefb_driver);
+        platform_driver_unregister(&gbefb_driver);
 }
 
 module_init(gbefb_init);
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index e20b9f3a255f..5924cc225c95 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -423,18 +423,18 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi)
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int imxfb_suspend(struct device *dev, pm_message_t state)
+static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct imxfb_info *fbi = dev_get_drvdata(dev);
+        struct imxfb_info *fbi = platform_get_drvdata(dev);
         pr_debug("%s\n",__FUNCTION__);
 
         imxfb_disable_controller(fbi);
         return 0;
 }
 
-static int imxfb_resume(struct device *dev)
+static int imxfb_resume(struct platform_device *dev)
 {
-        struct imxfb_info *fbi = dev_get_drvdata(dev);
+        struct imxfb_info *fbi = platform_get_drvdata(dev);
         pr_debug("%s\n",__FUNCTION__);
 
         imxfb_enable_controller(fbi);
@@ -538,9 +538,8 @@ static int __init imxfb_map_video_memory(struct fb_info *info)
         return fbi->map_cpu ? 0 : -ENOMEM;
 }
 
-static int __init imxfb_probe(struct device *dev)
+static int __init imxfb_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct imxfb_info *fbi;
         struct fb_info *info;
         struct imxfb_mach_info *inf;
@@ -553,21 +552,21 @@ static int __init imxfb_probe(struct device *dev)
         if(!res)
                 return -ENODEV;
 
-        inf = dev->platform_data;
+        inf = pdev->dev.platform_data;
         if(!inf) {
                 dev_err(dev,"No platform_data available\n");
                 return -ENOMEM;
         }
 
-        info = framebuffer_alloc(sizeof(struct imxfb_info), dev);
+        info = framebuffer_alloc(sizeof(struct imxfb_info), &pdev->dev);
         if(!info)
                 return -ENOMEM;
 
         fbi = info->par;
 
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
-        ret = imxfb_init_fbinfo(dev);
+        ret = imxfb_init_fbinfo(&pdev->dev);
         if( ret < 0 )
                 goto failed_init;
 
@@ -621,22 +620,21 @@ failed_register:
         fb_dealloc_cmap(&info->cmap);
 failed_cmap:
         if (!inf->fixed_screen_cpu)
-                dma_free_writecombine(dev,fbi->map_size,fbi->map_cpu,
+                dma_free_writecombine(&pdev->dev,fbi->map_size,fbi->map_cpu,
                            fbi->map_dma);
 failed_map:
         kfree(info->pseudo_palette);
 failed_regs:
         release_mem_region(res->start, res->end - res->start);
 failed_init:
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         framebuffer_release(info);
         return ret;
 }
 
-static int imxfb_remove(struct device *dev)
+static int imxfb_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
         struct imxfb_info *fbi = info->par;
         struct resource *res;
 
@@ -651,36 +649,37 @@ static int imxfb_remove(struct device *dev)
         framebuffer_release(info);
 
         release_mem_region(res->start, res->end - res->start + 1);
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         return 0;
 }
 
-void  imxfb_shutdown(struct device * dev)
+void  imxfb_shutdown(struct platform_device * dev)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct imxfb_info *fbi = info->par;
         imxfb_disable_controller(fbi);
 }
 
-static struct device_driver imxfb_driver = {
-        .name           = "imx-fb",
-        .bus            = &platform_bus_type,
+static struct platform_driver imxfb_driver = {
         .probe          = imxfb_probe,
         .suspend        = imxfb_suspend,
         .resume         = imxfb_resume,
         .remove         = imxfb_remove,
         .shutdown       = imxfb_shutdown,
+        .driver         = {
+                .name   = "imx-fb",
+        },
 };
 
 int __init imxfb_init(void)
 {
-        return driver_register(&imxfb_driver);
+        return platform_driver_register(&imxfb_driver);
 }
 
 static void __exit imxfb_cleanup(void)
 {
-        driver_unregister(&imxfb_driver);
+        platform_driver_unregister(&imxfb_driver);
 }
 
 module_init(imxfb_init);
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index f305a5b77b23..7b4cd250bec8 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -980,17 +980,17 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data)
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int pxafb_suspend(struct device *dev, pm_message_t state)
+static int pxafb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct pxafb_info *fbi = dev_get_drvdata(dev);
+        struct pxafb_info *fbi = platform_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_DISABLE_PM);
         return 0;
 }
 
-static int pxafb_resume(struct device *dev)
+static int pxafb_resume(struct platform_device *dev)
 {
-        struct pxafb_info *fbi = dev_get_drvdata(dev);
+        struct pxafb_info *fbi = platform_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_ENABLE_PM);
         return 0;
@@ -1268,7 +1268,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
 }
 #endif
 
-int __init pxafb_probe(struct device *dev)
+int __init pxafb_probe(struct platform_device *dev)
 {
         struct pxafb_info *fbi;
         struct pxafb_mach_info *inf;
@@ -1276,14 +1276,14 @@ int __init pxafb_probe(struct device *dev)
 
         dev_dbg(dev, "pxafb_probe\n");
 
-        inf = dev->platform_data;
+        inf = dev->dev.platform_data;
         ret = -ENOMEM;
         fbi = NULL;
         if (!inf)
                 goto failed;
 
 #ifdef CONFIG_FB_PXA_PARAMETERS
-        ret = pxafb_parse_options(dev, g_options);
+        ret = pxafb_parse_options(&dev->dev, g_options);
         if (ret < 0)
                 goto failed;
 #endif
@@ -1293,36 +1293,36 @@ int __init pxafb_probe(struct device *dev)
          * a warning is given. */
 
         if (inf->lccr0 & LCCR0_INVALID_CONFIG_MASK)
-                dev_warn(dev, "machine LCCR0 setting contains illegal bits: %08x\n",
+                dev_warn(&dev->dev, "machine LCCR0 setting contains illegal bits: %08x\n",
                         inf->lccr0 & LCCR0_INVALID_CONFIG_MASK);
         if (inf->lccr3 & LCCR3_INVALID_CONFIG_MASK)
-                dev_warn(dev, "machine LCCR3 setting contains illegal bits: %08x\n",
+                dev_warn(&dev->dev, "machine LCCR3 setting contains illegal bits: %08x\n",
                         inf->lccr3 & LCCR3_INVALID_CONFIG_MASK);
         if (inf->lccr0 & LCCR0_DPD &&
             ((inf->lccr0 & LCCR0_PAS) != LCCR0_Pas ||
              (inf->lccr0 & LCCR0_SDS) != LCCR0_Sngl ||
              (inf->lccr0 & LCCR0_CMS) != LCCR0_Mono))
-                dev_warn(dev, "Double Pixel Data (DPD) mode is only valid in passive mono"
+                dev_warn(&dev->dev, "Double Pixel Data (DPD) mode is only valid in passive mono"
                          " single panel mode\n");
         if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Act &&
             (inf->lccr0 & LCCR0_SDS) == LCCR0_Dual)
-                dev_warn(dev, "Dual panel only valid in passive mode\n");
+                dev_warn(&dev->dev, "Dual panel only valid in passive mode\n");
         if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Pas &&
              (inf->upper_margin || inf->lower_margin))
-                dev_warn(dev, "Upper and lower margins must be 0 in passive mode\n");
+                dev_warn(&dev->dev, "Upper and lower margins must be 0 in passive mode\n");
 #endif
 
-        dev_dbg(dev, "got a %dx%dx%d LCD\n",inf->xres, inf->yres, inf->bpp);
+        dev_dbg(&dev->dev, "got a %dx%dx%d LCD\n",inf->xres, inf->yres, inf->bpp);
         if (inf->xres == 0 || inf->yres == 0 || inf->bpp == 0) {
-                dev_err(dev, "Invalid resolution or bit depth\n");
+                dev_err(&dev->dev, "Invalid resolution or bit depth\n");
                 ret = -EINVAL;
                 goto failed;
         }
         pxafb_backlight_power = inf->pxafb_backlight_power;
         pxafb_lcd_power = inf->pxafb_lcd_power;
-        fbi = pxafb_init_fbinfo(dev);
+        fbi = pxafb_init_fbinfo(&dev->dev);
         if (!fbi) {
-                dev_err(dev, "Failed to initialize framebuffer device\n");
+                dev_err(&dev->dev, "Failed to initialize framebuffer device\n");
                 ret = -ENOMEM; // only reason for pxafb_init_fbinfo to fail is kmalloc
                 goto failed;
         }
@@ -1330,14 +1330,14 @@ int __init pxafb_probe(struct device *dev)
         /* Initialize video memory */
         ret = pxafb_map_video_memory(fbi);
         if (ret) {
-                dev_err(dev, "Failed to allocate video RAM: %d\n", ret);
+                dev_err(&dev->dev, "Failed to allocate video RAM: %d\n", ret);
                 ret = -ENOMEM;
                 goto failed;
         }
 
         ret = request_irq(IRQ_LCD, pxafb_handle_irq, SA_INTERRUPT, "LCD", fbi);
         if (ret) {
-                dev_err(dev, "request_irq failed: %d\n", ret);
+                dev_err(&dev->dev, "request_irq failed: %d\n", ret);
                 ret = -EBUSY;
                 goto failed;
         }
@@ -1349,11 +1349,11 @@ int __init pxafb_probe(struct device *dev)
         pxafb_check_var(&fbi->fb.var, &fbi->fb);
         pxafb_set_par(&fbi->fb);
 
-        dev_set_drvdata(dev, fbi);
+        platform_set_drvdata(dev, fbi);
 
         ret = register_framebuffer(&fbi->fb);
         if (ret < 0) {
-                dev_err(dev, "Failed to register framebuffer device: %d\n", ret);
+                dev_err(&dev->dev, "Failed to register framebuffer device: %d\n", ret);
                 goto failed;
         }
 
@@ -1376,19 +1376,20 @@ int __init pxafb_probe(struct device *dev)
         return 0;
 
 failed:
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
         kfree(fbi);
         return ret;
 }
 
-static struct device_driver pxafb_driver = {
-        .name           = "pxa2xx-fb",
-        .bus            = &platform_bus_type,
+static struct platform_driver pxafb_driver = {
         .probe          = pxafb_probe,
 #ifdef CONFIG_PM
         .suspend        = pxafb_suspend,
         .resume         = pxafb_resume,
 #endif
+        .driver         = {
+                .name   = "pxa2xx-fb",
+        },
 };
 
 #ifndef MODULE
@@ -1415,7 +1416,7 @@ int __devinit pxafb_init(void)
                 return -ENODEV;
         pxafb_setup(option);
 #endif
-        return driver_register(&pxafb_driver);
+        return platform_driver_register(&pxafb_driver);
 }
 
 module_init(pxafb_init);
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index bfc41f2c902a..fc91dbf896d2 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -86,9 +86,8 @@ static struct fb_ops q40fb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-static int __init q40fb_probe(struct device *device)
+static int __init q40fb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
 
         if (!MACH_IS_Q40)
@@ -128,10 +127,11 @@ static int __init q40fb_probe(struct device *device)
         return 0;
 }
 
-static struct device_driver q40fb_driver = {
-        .name   = "q40fb",
-        .bus    = &platform_bus_type,
+static struct platform_driver q40fb_driver = {
         .probe  = q40fb_probe,
+        .driver = {
+                .name   = "q40fb",
+        },
 };
 
 static struct platform_device q40fb_device = {
@@ -145,12 +145,12 @@ int __init q40fb_init(void)
         if (fb_get_options("q40fb", NULL))
                 return -ENODEV;
 
-        ret = driver_register(&q40fb_driver);
+        ret = platform_driver_register(&q40fb_driver);
 
         if (!ret) {
                 ret = platform_device_register(&q40fb_device);
                 if (ret)
-                        driver_unregister(&q40fb_driver);
+                        platform_driver_unregister(&q40fb_driver);
         }
         return ret;
 }
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index 3edbd14c5c46..e5d0f92eeae3 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -503,10 +503,9 @@ s1d13xxxfb_fetch_hw_state(struct fb_info *info)
 
 
 static int
-s1d13xxxfb_remove(struct device *dev)
+s1d13xxxfb_remove(struct platform_device *pdev)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
-        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
         struct s1d13xxxfb_par *par = NULL;
 
         if (info) {
@@ -534,9 +533,8 @@ s1d13xxxfb_remove(struct device *dev)
 }
 
 static int __devinit
-s1d13xxxfb_probe(struct device *dev)
+s1d13xxxfb_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct s1d13xxxfb_par *default_par;
         struct fb_info *info;
         struct s1d13xxxfb_pdata *pdata = NULL;
@@ -548,8 +546,8 @@ s1d13xxxfb_probe(struct device *dev)
         printk(KERN_INFO "Epson S1D13XXX FB Driver\n");
 
         /* enable platform-dependent hardware glue, if any */
-        if (dev->platform_data)
-                pdata = dev->platform_data;
+        if (pdev->dev.platform_data)
+                pdata = pdev->dev.platform_data;
 
         if (pdata && pdata->platform_init_video)
                 pdata->platform_init_video();
@@ -572,14 +570,14 @@ s1d13xxxfb_probe(struct device *dev)
 
         if (!request_mem_region(pdev->resource[0].start,
                 pdev->resource[0].end - pdev->resource[0].start +1, "s1d13xxxfb mem")) {
-                dev_dbg(dev, "request_mem_region failed\n");
+                dev_dbg(&pdev->dev, "request_mem_region failed\n");
                 ret = -EBUSY;
                 goto bail;
         }
 
         if (!request_mem_region(pdev->resource[1].start,
                 pdev->resource[1].end - pdev->resource[1].start +1, "s1d13xxxfb regs")) {
-                dev_dbg(dev, "request_mem_region failed\n");
+                dev_dbg(&pdev->dev, "request_mem_region failed\n");
                 ret = -EBUSY;
                 goto bail;
         }
@@ -640,7 +638,7 @@ s1d13xxxfb_probe(struct device *dev)
                 goto bail;
         }
 
-        dev_set_drvdata(&pdev->dev, info);
+        platform_set_drvdata(pdev, info);
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                info->node, info->fix.id);
@@ -648,15 +646,15 @@ s1d13xxxfb_probe(struct device *dev)
         return 0;
 
 bail:
-        s1d13xxxfb_remove(dev);
+        s1d13xxxfb_remove(pdev);
         return ret;
 
 }
 
 #ifdef CONFIG_PM
-static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
+static int s1d13xxxfb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct s1d13xxxfb_par *s1dfb = info->par;
         struct s1d13xxxfb_pdata *pdata = NULL;
 
@@ -664,8 +662,8 @@ static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
         lcd_enable(s1dfb, 0);
         crt_enable(s1dfb, 0);
 
-        if (dev->platform_data)
-                pdata = dev->platform_data;
+        if (dev->dev.platform_data)
+                pdata = dev->dev.platform_data;
 
 #if 0
         if (!s1dfb->disp_save)
@@ -701,9 +699,9 @@ static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
                 return 0;
 }
 
-static int s1d13xxxfb_resume(struct device *dev)
+static int s1d13xxxfb_resume(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct s1d13xxxfb_par *s1dfb = info->par;
         struct s1d13xxxfb_pdata *pdata = NULL;
 
@@ -714,8 +712,8 @@ static int s1d13xxxfb_resume(struct device *dev)
         while ((s1d13xxxfb_readreg(s1dfb, S1DREG_PS_STATUS) & 0x01))
                 udelay(10);
 
-        if (dev->platform_data)
-                pdata = dev->platform_data;
+        if (dev->dev.platform_data)
+                pdata = dev->dev.platform_data;
 
         if (s1dfb->regs_save) {
                 /* will write RO regs, *should* get away with it :) */
@@ -741,15 +739,16 @@ static int s1d13xxxfb_resume(struct device *dev)
 }
 #endif /* CONFIG_PM */
 
-static struct device_driver s1d13xxxfb_driver = {
-        .name           = S1D_DEVICENAME,
-        .bus            = &platform_bus_type,
+static struct platform_driver s1d13xxxfb_driver = {
         .probe          = s1d13xxxfb_probe,
         .remove         = s1d13xxxfb_remove,
 #ifdef CONFIG_PM
         .suspend        = s1d13xxxfb_suspend,
-        .resume         = s1d13xxxfb_resume
+        .resume         = s1d13xxxfb_resume,
 #endif
+        .driver         = {
+                .name   = S1D_DEVICENAME,
+        },
 };
 
 
@@ -759,14 +758,14 @@ s1d13xxxfb_init(void)
         if (fb_get_options("s1d13xxxfb", NULL))
                 return -ENODEV;
 
-        return driver_register(&s1d13xxxfb_driver);
+        return platform_driver_register(&s1d13xxxfb_driver);
 }
 
 
 static void __exit
 s1d13xxxfb_exit(void)
 {
-        driver_unregister(&s1d13xxxfb_driver);
+        platform_driver_unregister(&s1d13xxxfb_driver);
 }
 
 module_init(s1d13xxxfb_init);
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 855a6778b9eb..ce6e749db3a7 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -634,19 +634,18 @@ static irqreturn_t s3c2410fb_irq(int irq, void *dev_id, struct pt_regs *r)
 
 static char driver_name[]="s3c2410fb";
 
-int __init s3c2410fb_probe(struct device *dev)
+int __init s3c2410fb_probe(struct platform_device *pdev)
 {
         struct s3c2410fb_info *info;
         struct fb_info     *fbinfo;
-        struct platform_device *pdev = to_platform_device(dev);
         struct s3c2410fb_hw *mregs;
         int ret;
         int irq;
         int i;
 
-        mach_info = dev->platform_data;
+        mach_info = pdev->dev.platform_data;
         if (mach_info == NULL) {
-                dev_err(dev,"no platform data for lcd, cannot attach\n");
+                dev_err(&pdev->dev,"no platform data for lcd, cannot attach\n");
                 return -EINVAL;
         }
 
@@ -654,11 +653,11 @@ int __init s3c2410fb_probe(struct device *dev)
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
-                dev_err(dev, "no irq for device\n");
+                dev_err(&pdev->dev, "no irq for device\n");
                 return -ENOENT;
         }
 
-        fbinfo = framebuffer_alloc(sizeof(struct s3c2410fb_info), dev);
+        fbinfo = framebuffer_alloc(sizeof(struct s3c2410fb_info), &pdev->dev);
         if (!fbinfo) {
                 return -ENOMEM;
         }
@@ -666,7 +665,7 @@ int __init s3c2410fb_probe(struct device *dev)
 
         info = fbinfo->par;
         info->fb = fbinfo;
-        dev_set_drvdata(dev, fbinfo);
+        platform_set_drvdata(pdev, fbinfo);
 
         s3c2410fb_init_registers(info);
 
@@ -676,7 +675,7 @@ int __init s3c2410fb_probe(struct device *dev)
 
         memcpy(&info->regs, &mach_info->regs, sizeof(info->regs));
 
-        info->mach_info             = dev->platform_data;
+        info->mach_info             = pdev->dev.platform_data;
 
         fbinfo->fix.type            = FB_TYPE_PACKED_PIXELS;
         fbinfo->fix.type_aux        = 0;
@@ -735,7 +734,7 @@ int __init s3c2410fb_probe(struct device *dev)
 
         ret = request_irq(irq, s3c2410fb_irq, SA_INTERRUPT, pdev->name, info);
         if (ret) {
-                dev_err(dev, "cannot get irq %d - err %d\n", irq, ret);
+                dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret);
                 ret = -EBUSY;
                 goto release_mem;
         }
@@ -773,7 +772,7 @@ int __init s3c2410fb_probe(struct device *dev)
         }
 
         /* create device files */
-        device_create_file(dev, &dev_attr_debug);
+        device_create_file(&pdev->dev, &dev_attr_debug);
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                 fbinfo->node, fbinfo->fix.id);
@@ -816,10 +815,9 @@ static void s3c2410fb_stop_lcd(void)
 /*
  *  Cleanup
  */
-static int s3c2410fb_remove(struct device *dev)
+static int s3c2410fb_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct fb_info     *fbinfo = dev_get_drvdata(dev);
+        struct fb_info     *fbinfo = platform_get_drvdata(pdev);
         struct s3c2410fb_info *info = fbinfo->par;
         int irq;
 
@@ -847,9 +845,9 @@ static int s3c2410fb_remove(struct device *dev)
 
 /* suspend and resume support for the lcd controller */
 
-static int s3c2410fb_suspend(struct device *dev, pm_message_t state)
+static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct fb_info     *fbinfo = dev_get_drvdata(dev);
+        struct fb_info     *fbinfo = platform_get_drvdata(dev);
         struct s3c2410fb_info *info = fbinfo->par;
 
         s3c2410fb_stop_lcd();
@@ -864,9 +862,9 @@ static int s3c2410fb_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int s3c2410fb_resume(struct device *dev)
+static int s3c2410fb_resume(struct platform_device *dev)
 {
-        struct fb_info     *fbinfo = dev_get_drvdata(dev);
+        struct fb_info     *fbinfo = platform_get_drvdata(dev);
         struct s3c2410fb_info *info = fbinfo->par;
 
         clk_enable(info->clk);
@@ -882,24 +880,25 @@ static int s3c2410fb_resume(struct device *dev)
 #define s3c2410fb_resume  NULL
 #endif
 
-static struct device_driver s3c2410fb_driver = {
-        .name           = "s3c2410-lcd",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410fb_driver = {
         .probe          = s3c2410fb_probe,
+        .remove         = s3c2410fb_remove,
         .suspend        = s3c2410fb_suspend,
         .resume         = s3c2410fb_resume,
-        .remove         = s3c2410fb_remove
+        .driver         = {
+                .name   = "s3c2410-lcd",
+                .owner  = THIS_MODULE,
+        },
 };
 
 int __devinit s3c2410fb_init(void)
 {
-        return driver_register(&s3c2410fb_driver);
+        return platform_driver_register(&s3c2410fb_driver);
 }
 
 static void __exit s3c2410fb_cleanup(void)
 {
-        driver_unregister(&s3c2410fb_driver);
+        platform_driver_unregister(&s3c2410fb_driver);
 }
 
 
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index a5184575cfae..2ea1354e439f 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1308,17 +1308,17 @@ sa1100fb_freq_policy(struct notifier_block *nb, unsigned long val,
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int sa1100fb_suspend(struct device *dev, pm_message_t state)
+static int sa1100fb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct sa1100fb_info *fbi = dev_get_drvdata(dev);
+        struct sa1100fb_info *fbi = platform_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_DISABLE_PM);
         return 0;
 }
 
-static int sa1100fb_resume(struct device *dev)
+static int sa1100fb_resume(struct platform_device *dev)
 {
-        struct sa1100fb_info *fbi = dev_get_drvdata(dev);
+        struct sa1100fb_info *fbi = platform_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_ENABLE_PM);
         return 0;
@@ -1452,7 +1452,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
         return fbi;
 }
 
-static int __init sa1100fb_probe(struct device *dev)
+static int __init sa1100fb_probe(struct platform_device *pdev)
 {
         struct sa1100fb_info *fbi;
         int ret;
@@ -1460,7 +1460,7 @@ static int __init sa1100fb_probe(struct device *dev)
         if (!request_mem_region(0xb0100000, 0x10000, "LCD"))
                 return -EBUSY;
 
-        fbi = sa1100fb_init_fbinfo(dev);
+        fbi = sa1100fb_init_fbinfo(&pdev->dev);
         ret = -ENOMEM;
         if (!fbi)
                 goto failed;
@@ -1488,7 +1488,7 @@ static int __init sa1100fb_probe(struct device *dev)
          */
         sa1100fb_check_var(&fbi->fb.var, &fbi->fb);
 
-        dev_set_drvdata(dev, fbi);
+        platform_set_drvdata(pdev, fbi);
 
         ret = register_framebuffer(&fbi->fb);
         if (ret < 0)
@@ -1505,18 +1505,19 @@ static int __init sa1100fb_probe(struct device *dev)
         return 0;
 
 failed:
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         kfree(fbi);
         release_mem_region(0xb0100000, 0x10000);
         return ret;
 }
 
-static struct device_driver sa1100fb_driver = {
-        .name           = "sa11x0-fb",
-        .bus            = &platform_bus_type,
+static struct platform_driver sa1100fb_driver = {
         .probe          = sa1100fb_probe,
         .suspend        = sa1100fb_suspend,
         .resume         = sa1100fb_resume,
+        .driver         = {
+                .name   = "sa11x0-fb",
+        },
 };
 
 int __init sa1100fb_init(void)
@@ -1524,7 +1525,7 @@ int __init sa1100fb_init(void)
         if (fb_get_options("sa1100fb", NULL))
                 return -ENODEV;
 
-        return driver_register(&sa1100fb_driver);
+        return platform_driver_register(&sa1100fb_driver);
 }
 
 int __init sa1100fb_setup(char *options)
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index 2e8769dd345a..7054660767e4 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -750,9 +750,8 @@ int __init sgivwfb_setup(char *options)
 /*
  *  Initialisation
  */
-static int __init sgivwfb_probe(struct device *device)
+static int __init sgivwfb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct sgivw_par *par;
         struct fb_info *info;
         char *monitor;
@@ -813,7 +812,7 @@ static int __init sgivwfb_probe(struct device *device)
                 goto fail_register_framebuffer;
         }
 
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         printk(KERN_INFO "fb%d: SGI DBE frame buffer device, using %ldK of video memory at %#lx\n",      
                 info->node, sgivwfb_mem_size >> 10, sgivwfb_mem_phys);
@@ -831,9 +830,9 @@ fail_ioremap_regs:
         return -ENXIO;
 }
 
-static int sgivwfb_remove(struct device *device)
+static int sgivwfb_remove(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(device);
+        struct fb_info *info = platform_get_drvdata(dev);
 
         if (info) {
                 struct sgivw_par *par = info->par;
@@ -847,11 +846,12 @@ static int sgivwfb_remove(struct device *device)
         return 0;
 }
 
-static struct device_driver sgivwfb_driver = {
-        .name   = "sgivwfb",
-        .bus    = &platform_bus_type,
+static struct platform_driver sgivwfb_driver = {
         .probe  = sgivwfb_probe,
         .remove = sgivwfb_remove,
+        .driver = {
+                .name   = "sgivwfb",
+        },
 };
 
 static struct platform_device *sgivwfb_device;
@@ -867,7 +867,7 @@ int __init sgivwfb_init(void)
                 return -ENODEV;
         sgivwfb_setup(option);
 #endif
-        ret = driver_register(&sgivwfb_driver);
+        ret = platform_driver_register(&sgivwfb_driver);
         if (!ret) {
                 sgivwfb_device = platform_device_alloc("sgivwfb", 0);
                 if (sgivwfb_device) {
@@ -875,7 +875,7 @@ int __init sgivwfb_init(void)
                 } else
                         ret = -ENOMEM;
                 if (ret) {
-                        driver_unregister(&sgivwfb_driver);
+                        platform_driver_unregister(&sgivwfb_driver);
                         platform_device_put(sgivwfb_device);
                 }
         }
@@ -890,7 +890,7 @@ MODULE_LICENSE("GPL");
 static void __exit sgivwfb_exit(void)
 {
         platform_device_unregister(sgivwfb_device);
-        driver_unregister(&sgivwfb_driver);
+        platform_driver_unregister(&sgivwfb_driver);
 }
 
 module_exit(sgivwfb_exit);
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index e25eae1a78c1..2c3aa2fcfd91 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -245,9 +245,8 @@ static int __init vesafb_setup(char *options)
         return 0;
 }
 
-static int __init vesafb_probe(struct device *device)
+static int __init vesafb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
         int i, err;
         unsigned int size_vmode;
@@ -480,10 +479,11 @@ err:
         return err;
 }
 
-static struct device_driver vesafb_driver = {
-        .name   = "vesafb",
-        .bus    = &platform_bus_type,
+static struct platform_driver vesafb_driver = {
         .probe  = vesafb_probe,
+        .driver = {
+                .name   = "vesafb",
+        },
 };
 
 static struct platform_device vesafb_device = {
@@ -498,12 +498,12 @@ static int __init vesafb_init(void)
         /* ignore error return of fb_get_options */
         fb_get_options("vesafb", &option);
         vesafb_setup(option);
-        ret = driver_register(&vesafb_driver);
+        ret = platform_driver_register(&vesafb_driver);
 
         if (!ret) {
                 ret = platform_device_register(&vesafb_device);
                 if (ret)
-                        driver_unregister(&vesafb_driver);
+                        platform_driver_unregister(&vesafb_driver);
         }
         return ret;
 }
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 8794dc5d2466..ffa1ad474226 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -403,9 +403,8 @@ static void vfb_platform_release(struct device *device)
         // This is called when the reference count goes to zero.
 }
 
-static int __init vfb_probe(struct device *device)
+static int __init vfb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
         int retval = -ENOMEM;
 
@@ -447,7 +446,7 @@ static int __init vfb_probe(struct device *device)
         retval = register_framebuffer(info);
         if (retval < 0)
                 goto err2;
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         printk(KERN_INFO
                "fb%d: Virtual frame buffer device, using %ldK of video memory\n",
@@ -462,9 +461,9 @@ err:
         return retval;
 }
 
-static int vfb_remove(struct device *device)
+static int vfb_remove(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(device);
+        struct fb_info *info = platform_get_drvdata(dev);
 
         if (info) {
                 unregister_framebuffer(info);
@@ -474,11 +473,12 @@ static int vfb_remove(struct device *device)
         return 0;
 }
 
-static struct device_driver vfb_driver = {
-        .name   = "vfb",
-        .bus    = &platform_bus_type,
+static struct platform_driver vfb_driver = {
         .probe  = vfb_probe,
         .remove = vfb_remove,
+        .driver = {
+                .name   = "vfb",
+        },
 };
 
 static struct platform_device vfb_device = {
@@ -504,12 +504,12 @@ static int __init vfb_init(void)
         if (!vfb_enable)
                 return -ENXIO;
 
-        ret = driver_register(&vfb_driver);
+        ret = platform_driver_register(&vfb_driver);
 
         if (!ret) {
                 ret = platform_device_register(&vfb_device);
                 if (ret)
-                        driver_unregister(&vfb_driver);
+                        platform_driver_unregister(&vfb_driver);
         }
         return ret;
 }
@@ -520,7 +520,7 @@ module_init(vfb_init);
 static void __exit vfb_exit(void)
 {
         platform_device_unregister(&vfb_device);
-        driver_unregister(&vfb_driver);
+        platform_driver_unregister(&vfb_driver);
 }
 
 module_exit(vfb_exit);
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 48e70f153c4b..daa46051f55d 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -437,9 +437,9 @@ static void w100fb_restore_vidmem(struct w100fb_par *par)
         }
 }
 
-static int w100fb_suspend(struct device *dev, pm_message_t state)
+static int w100fb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct w100fb_par *par=info->par;
         struct w100_tg_info *tg = par->mach->tg;
 
@@ -452,9 +452,9 @@ static int w100fb_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int w100fb_resume(struct device *dev)
+static int w100fb_resume(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct w100fb_par *par=info->par;
         struct w100_tg_info *tg = par->mach->tg;
 
@@ -473,13 +473,12 @@ static int w100fb_resume(struct device *dev)
 #endif
 
 
-int __init w100fb_probe(struct device *dev)
+int __init w100fb_probe(struct platform_device *pdev)
 {
         int err = -EIO;
         struct w100fb_mach_info *inf;
         struct fb_info *info = NULL;
         struct w100fb_par *par;
-        struct platform_device *pdev = to_platform_device(dev);
         struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         unsigned int chip_id;
 
@@ -522,9 +521,9 @@ int __init w100fb_probe(struct device *dev)
         }
 
         par = info->par;
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
-        inf = dev->platform_data;
+        inf = pdev->dev.platform_data;
         par->chip_id = chip_id;
         par->mach = inf;
         par->fastpll_mode = 0;
@@ -600,10 +599,10 @@ int __init w100fb_probe(struct device *dev)
                 goto out;
         }
 
-        device_create_file(dev, &dev_attr_fastpllclk);
-        device_create_file(dev, &dev_attr_reg_read);
-        device_create_file(dev, &dev_attr_reg_write);
-        device_create_file(dev, &dev_attr_flip);
+        device_create_file(&pdev->dev, &dev_attr_fastpllclk);
+        device_create_file(&pdev->dev, &dev_attr_reg_read);
+        device_create_file(&pdev->dev, &dev_attr_reg_write);
+        device_create_file(&pdev->dev, &dev_attr_flip);
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
         return 0;
@@ -622,15 +621,15 @@ out:
 }
 
 
-static int w100fb_remove(struct device *dev)
+static int w100fb_remove(struct platform_device *pdev)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
         struct w100fb_par *par=info->par;
 
-        device_remove_file(dev, &dev_attr_fastpllclk);
-        device_remove_file(dev, &dev_attr_reg_read);
-        device_remove_file(dev, &dev_attr_reg_write);
-        device_remove_file(dev, &dev_attr_flip);
+        device_remove_file(&pdev->dev, &dev_attr_fastpllclk);
+        device_remove_file(&pdev->dev, &dev_attr_reg_read);
+        device_remove_file(&pdev->dev, &dev_attr_reg_write);
+        device_remove_file(&pdev->dev, &dev_attr_flip);
 
         unregister_framebuffer(info);
 
@@ -1448,23 +1447,24 @@ static void w100_vsync(void)
         writel(0x00000002, remapped_regs + mmGEN_INT_STATUS);
 }
 
-static struct device_driver w100fb_driver = {
-        .name           = "w100fb",
-        .bus            = &platform_bus_type,
+static struct platform_driver w100fb_driver = {
         .probe          = w100fb_probe,
         .remove         = w100fb_remove,
         .suspend        = w100fb_suspend,
         .resume         = w100fb_resume,
+        .driver         = {
+                .name   = "w100fb",
+        },
 };
 
 int __devinit w100fb_init(void)
 {
-        return driver_register(&w100fb_driver);
+        return platform_driver_register(&w100fb_driver);
 }
 
 void __exit w100fb_cleanup(void)
 {
-        driver_unregister(&w100fb_driver);
+        platform_driver_unregister(&w100fb_driver);
 }
 
 module_init(w100fb_init);