提交 b2ebd9dd 编写于 作者: R Rafael J. Wysocki

driver core: Split device_platform_notify()

Split device_platform_notify_remove) out of device_platform_notify()
and call the latter on device addition and the former on device
removal.

No intentional functional impact.
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
上级 384f5a85
...@@ -2000,24 +2000,24 @@ static inline int device_is_not_partition(struct device *dev) ...@@ -2000,24 +2000,24 @@ static inline int device_is_not_partition(struct device *dev)
} }
#endif #endif
static int static void device_platform_notify(struct device *dev)
device_platform_notify(struct device *dev, enum kobject_action action)
{ {
if (action == KOBJ_ADD) acpi_device_notify(dev);
acpi_device_notify(dev);
else if (action == KOBJ_REMOVE)
acpi_device_notify_remove(dev);
if (action == KOBJ_ADD) software_node_notify(dev);
software_node_notify(dev);
else if (action == KOBJ_REMOVE)
software_node_notify_remove(dev);
if (platform_notify && action == KOBJ_ADD) if (platform_notify)
platform_notify(dev); 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); platform_notify_remove(dev);
return 0;
} }
/** /**
...@@ -3289,9 +3289,7 @@ int device_add(struct device *dev) ...@@ -3289,9 +3289,7 @@ int device_add(struct device *dev)
} }
/* notify platform of device entry */ /* notify platform of device entry */
error = device_platform_notify(dev, KOBJ_ADD); device_platform_notify(dev);
if (error)
goto platform_error;
error = device_create_file(dev, &dev_attr_uevent); error = device_create_file(dev, &dev_attr_uevent);
if (error) if (error)
...@@ -3394,8 +3392,7 @@ int device_add(struct device *dev) ...@@ -3394,8 +3392,7 @@ int device_add(struct device *dev)
SymlinkError: SymlinkError:
device_remove_file(dev, &dev_attr_uevent); device_remove_file(dev, &dev_attr_uevent);
attrError: attrError:
device_platform_notify(dev, KOBJ_REMOVE); device_platform_notify_remove(dev);
platform_error:
kobject_uevent(&dev->kobj, KOBJ_REMOVE); kobject_uevent(&dev->kobj, KOBJ_REMOVE);
glue_dir = get_glue_dir(dev); glue_dir = get_glue_dir(dev);
kobject_del(&dev->kobj); kobject_del(&dev->kobj);
...@@ -3540,7 +3537,7 @@ void device_del(struct device *dev) ...@@ -3540,7 +3537,7 @@ void device_del(struct device *dev)
bus_remove_device(dev); bus_remove_device(dev);
device_pm_remove(dev); device_pm_remove(dev);
driver_deferred_probe_del(dev); driver_deferred_probe_del(dev);
device_platform_notify(dev, KOBJ_REMOVE); device_platform_notify_remove(dev);
device_remove_properties(dev); device_remove_properties(dev);
device_links_purge(dev); device_links_purge(dev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册