diff mbox series

[v1,3/6] ACPI: bus: Rename functions to avoid name collision

Message ID 3605918.kQq0lBPeGt@kreacher (mailing list archive)
State Awaiting Upstream
Delegated to: Rafael Wysocki
Headers show
Series ACPI: glue / driver core: Eliminate acpi_platform_notify() and split device_platform_notify() | expand

Commit Message

Rafael J. Wysocki July 12, 2021, 5:24 p.m. UTC
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

There is a name collision between acpi_device_notify() defined in
bus.c and another static function defined in glue.c.

Since the latter is going to be exported from that file, rename the
former to acpi_notify_device() and rename acpi_device_notify_fixed()
to follow the same naming pattern.

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 drivers/acpi/bus.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
diff mbox series


Index: linux-pm/drivers/acpi/bus.c
--- linux-pm.orig/drivers/acpi/bus.c
+++ linux-pm/drivers/acpi/bus.c
@@ -498,24 +498,24 @@  static void acpi_bus_notify(acpi_handle
 	acpi_evaluate_ost(handle, type, ost_code, NULL);
-static void acpi_device_notify(acpi_handle handle, u32 event, void *data)
+static void acpi_notify_device(acpi_handle handle, u32 event, void *data)
 	struct acpi_device *device = data;
 	device->driver->ops.notify(device, event);
-static void acpi_device_notify_fixed(void *data)
+static void acpi_notify_device_fixed(void *data)
 	struct acpi_device *device = data;
 	/* Fixed hardware devices have no handles */
-	acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
+	acpi_notify_device(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
 static u32 acpi_device_fixed_event(void *data)
-	acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data);
+	acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_notify_device_fixed, data);
@@ -536,7 +536,7 @@  static int acpi_device_install_notify_ha
 		status = acpi_install_notify_handler(device->handle,
-						     acpi_device_notify,
+						     acpi_notify_device,
 	if (ACPI_FAILURE(status))
@@ -554,7 +554,7 @@  static void acpi_device_remove_notify_ha
 		acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
-					   acpi_device_notify);
+					   acpi_notify_device);
 /* Handle events targeting \_SB device (at present only graceful shutdown) */