Commit b2ebd9dd authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 384f5a85

drivers/base/core.c

+16 −19
Original line number Diff line number Diff line
@@ -2000,24 +2000,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)

{

	if (action == KOBJ_ADD)

	acpi_device_notify(dev);

	else if (action == KOBJ_REMOVE)

		acpi_device_notify_remove(dev);



	if (action == KOBJ_ADD)

	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);

	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;

}



/**
@@ -3289,9 +3289,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 +3392,7 @@ int device_add(struct device *dev) 
 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 +3537,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);