mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-01 10:43:43 +00:00
ACPI: glue: Eliminate acpi_platform_notify()
Get rid of acpi_platform_notify() which is redundant and make device_platform_notify() in the driver core call acpi_device_notify() and acpi_device_notify_remove() directly. No functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
parent
5e557cbac8
commit
d0b8e39831
@ -285,7 +285,7 @@ int acpi_unbind_one(struct device *dev)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_unbind_one);
|
||||
|
||||
static void acpi_device_notify(struct device *dev)
|
||||
void acpi_device_notify(struct device *dev)
|
||||
{
|
||||
struct acpi_bus_type *type = acpi_get_bus_type(dev);
|
||||
struct acpi_device *adev;
|
||||
@ -324,7 +324,7 @@ static void acpi_device_notify(struct device *dev)
|
||||
dev_dbg(dev, "No ACPI support\n");
|
||||
}
|
||||
|
||||
static void acpi_device_notify_remove(struct device *dev)
|
||||
void acpi_device_notify_remove(struct device *dev)
|
||||
{
|
||||
struct acpi_device *adev = ACPI_COMPANION(dev);
|
||||
struct acpi_bus_type *type;
|
||||
@ -340,18 +340,3 @@ static void acpi_device_notify_remove(struct device *dev)
|
||||
|
||||
acpi_unbind_one(dev);
|
||||
}
|
||||
|
||||
int acpi_platform_notify(struct device *dev, enum kobject_action action)
|
||||
{
|
||||
switch (action) {
|
||||
case KOBJ_ADD:
|
||||
acpi_device_notify(dev);
|
||||
break;
|
||||
case KOBJ_REMOVE:
|
||||
acpi_device_notify_remove(dev);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -2005,9 +2005,10 @@ device_platform_notify(struct device *dev, enum kobject_action action)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = acpi_platform_notify(dev, action);
|
||||
if (ret)
|
||||
return ret;
|
||||
if (action == KOBJ_ADD)
|
||||
acpi_device_notify(dev);
|
||||
else if (action == KOBJ_REMOVE)
|
||||
acpi_device_notify_remove(dev);
|
||||
|
||||
ret = software_node_notify(dev, action);
|
||||
if (ret)
|
||||
|
@ -1380,13 +1380,11 @@ static inline int find_acpi_cpu_cache_topology(unsigned int cpu, int level)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ACPI
|
||||
extern int acpi_platform_notify(struct device *dev, enum kobject_action action);
|
||||
extern void acpi_device_notify(struct device *dev);
|
||||
extern void acpi_device_notify_remove(struct device *dev);
|
||||
#else
|
||||
static inline int
|
||||
acpi_platform_notify(struct device *dev, enum kobject_action action)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
static inline void acpi_device_notify(struct device *dev) { }
|
||||
static inline void acpi_device_notify_remove(struct device *dev) { }
|
||||
#endif
|
||||
|
||||
#endif /*_LINUX_ACPI_H*/
|
||||
|
Loading…
Reference in New Issue
Block a user