Merge branch 'master' into fixes

2 files changed, 26 insertions, 29 deletions

diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index b530e9116a0c..f58ba3589908 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -316,21 +316,6 @@ pdev_fixup_device_resources(struct pci_sys_data *root, struct pci_dev *dev)
         }
 }
 
-static void __devinit
-pbus_assign_bus_resources(struct pci_bus *bus, struct pci_sys_data *root)
-{
-        struct pci_dev *dev = bus->self;
-        int i;
-
-        if (!dev) {
-                /*
-                 * Assign root bus resources.
-                 */
-                for (i = 0; i < 3; i++)
-                        bus->resource[i] = root->resource[i];
-        }
-}
-
 /*
  * pcibios_fixup_bus - Called after each bus is probed,
  * but before its children are examined.
@@ -341,8 +326,6 @@ void pcibios_fixup_bus(struct pci_bus *bus)
         struct pci_dev *dev;
         u16 features = PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_FAST_BACK;
 
-        pbus_assign_bus_resources(bus, root);
-
         /*
          * Walk the devices on this bus, working out what we can
          * and can't support.
@@ -508,12 +491,18 @@ static void __init pcibios_init_hw(struct hw_pci *hw)
                 sys->busnr   = busnr;
                 sys->swizzle = hw->swizzle;
                 sys->map_irq = hw->map_irq;
-                sys->resource[0] = &ioport_resource;
-                sys->resource[1] = &iomem_resource;
+                INIT_LIST_HEAD(&sys->resources);
 
                 ret = hw->setup(nr, sys);
 
                 if (ret > 0) {
+                        if (list_empty(&sys->resources)) {
+                                pci_add_resource(&sys->resources,
+                                                 &ioport_resource);
+                                pci_add_resource(&sys->resources,
+                                                 &iomem_resource);
+                        }
+
                         sys->bus = hw->scan(nr, sys);
 
                         if (!sys->bus)
@@ -571,6 +560,13 @@ void __init pci_common_init(struct hw_pci *hw)
         }
 }
 
+#ifndef CONFIG_PCI_HOST_ITE8152
+void pcibios_set_master(struct pci_dev *dev)
+{
+        /* No special bus mastering setup handling */
+}
+#endif
+
 char * __init pcibios_setup(char *str)
 {
         if (!strcmp(str, "debug")) {
diff --git a/arch/arm/kernel/leds.c b/arch/arm/kernel/leds.c
index 0bcd38341573..1911dae19e4f 100644
--- a/arch/arm/kernel/leds.c
+++ b/arch/arm/kernel/leds.c
@@ -9,7 +9,7 @@
  */
 #include <linux/export.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/string.h>
 
@@ -34,8 +34,8 @@ static const struct leds_evt_name evt_names[] = {
         { "red",   led_red_on,   led_red_off   },
 };
 
-static ssize_t leds_store(struct sys_device *dev,
-                        struct sysdev_attribute *attr,
+static ssize_t leds_store(struct device *dev,
+                        struct device_attribute *attr,
                         const char *buf, size_t size)
 {
         int ret = -EINVAL, len = strcspn(buf, " ");
@@ -69,15 +69,16 @@ static ssize_t leds_store(struct sys_device *dev,
         return ret;
 }
 
-static SYSDEV_ATTR(event, 0200, NULL, leds_store);
+static DEVICE_ATTR(event, 0200, NULL, leds_store);
 
-static struct sysdev_class leds_sysclass = {
+static struct bus_type leds_subsys = {
         .name           = "leds",
+        .dev_name       = "leds",
 };
 
-static struct sys_device leds_device = {
+static struct device leds_device = {
         .id             = 0,
-        .cls            = &leds_sysclass,
+        .bus            = &leds_subsys,
 };
 
 static int leds_suspend(void)
@@ -105,11 +106,11 @@ static struct syscore_ops leds_syscore_ops = {
 static int __init leds_init(void)
 {
         int ret;
-        ret = sysdev_class_register(&leds_sysclass);
+        ret = subsys_system_register(&leds_subsys, NULL);
         if (ret == 0)
-                ret = sysdev_register(&leds_device);
+                ret = device_register(&leds_device);
         if (ret == 0)
-                ret = sysdev_create_file(&leds_device, &attr_event);
+                ret = device_create_file(&leds_device, &dev_attr_event);
         if (ret == 0)
                 register_syscore_ops(&leds_syscore_ops);
         return ret;