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

ACPI: bus: Rename functions to avoid name collision 



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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 7d625e5b

drivers/acpi/bus.c

+6 −6
Original line number Diff line number Diff line
@@ -498,24 +498,24 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) 
	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);

	return ACPI_INTERRUPT_HANDLED;

}
@@ -536,7 +536,7 @@ static int acpi_device_install_notify_handler(struct acpi_device *device) 
	else

		status = acpi_install_notify_handler(device->handle,

						     ACPI_DEVICE_NOTIFY,

						     acpi_device_notify,

						     acpi_notify_device,

						     device);



	if (ACPI_FAILURE(status))
@@ -554,7 +554,7 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device) 
						acpi_device_fixed_event);

	else

		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) */