Merge branches 'acpi-numa', 'acpi-glue', 'acpi-config' and 'acpi-pmic'

[platform/kernel/linux-rpi.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index cadcade..3a72241 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -574,8 +574,10 @@ static void devlink_remove_symlinks(struct device *dev,
                return;
        }
 
-       snprintf(buf, len, "supplier:%s:%s", dev_bus_name(sup), dev_name(sup));
-       sysfs_remove_link(&con->kobj, buf);
+       if (device_is_registered(con)) {
+               snprintf(buf, len, "supplier:%s:%s", dev_bus_name(sup), dev_name(sup));
+               sysfs_remove_link(&con->kobj, buf);
+       }
        snprintf(buf, len, "consumer:%s:%s", dev_bus_name(con), dev_name(con));
        sysfs_remove_link(&sup->kobj, buf);
        kfree(buf);
@@ -2000,24 +2002,24 @@ static inline int device_is_not_partition(struct device *dev)
 }
 #endif
 
-static int
-device_platform_notify(struct device *dev, enum kobject_action action)
+static void device_platform_notify(struct device *dev)
 {
-       int ret;
-
-       ret = acpi_platform_notify(dev, action);
-       if (ret)
-               return ret;
+       acpi_device_notify(dev);
 
-       ret = software_node_notify(dev, action);
-       if (ret)
-               return ret;
+       software_node_notify(dev);
 
-       if (platform_notify && action == KOBJ_ADD)
+       if (platform_notify)
                platform_notify(dev);
-       else if (platform_notify_remove && action == KOBJ_REMOVE)
+}
+
+static void device_platform_notify_remove(struct device *dev)
+{
+       acpi_device_notify_remove(dev);
+
+       software_node_notify_remove(dev);
+
+       if (platform_notify_remove)
                platform_notify_remove(dev);
-       return 0;
 }
 
 /**
@@ -2835,6 +2837,7 @@ void device_initialize(struct device *dev)
        device_pm_init(dev);
        set_dev_node(dev, -1);
 #ifdef CONFIG_GENERIC_MSI_IRQ
+       raw_spin_lock_init(&dev->msi_lock);
        INIT_LIST_HEAD(&dev->msi_list);
 #endif
        INIT_LIST_HEAD(&dev->links.consumers);
@@ -3289,9 +3292,7 @@ int device_add(struct device *dev)
        }
 
        /* notify platform of device entry */
-       error = device_platform_notify(dev, KOBJ_ADD);
-       if (error)
-               goto platform_error;
+       device_platform_notify(dev);
 
        error = device_create_file(dev, &dev_attr_uevent);
        if (error)
@@ -3394,8 +3395,7 @@ done:
  SymlinkError:
        device_remove_file(dev, &dev_attr_uevent);
  attrError:
-       device_platform_notify(dev, KOBJ_REMOVE);
-platform_error:
+       device_platform_notify_remove(dev);
        kobject_uevent(&dev->kobj, KOBJ_REMOVE);
        glue_dir = get_glue_dir(dev);
        kobject_del(&dev->kobj);
@@ -3540,7 +3540,7 @@ void device_del(struct device *dev)
        bus_remove_device(dev);
        device_pm_remove(dev);
        driver_deferred_probe_del(dev);
-       device_platform_notify(dev, KOBJ_REMOVE);
+       device_platform_notify_remove(dev);
        device_remove_properties(dev);
        device_links_purge(dev);