Skip to content

Commit 5e557cb

Browse files
committed
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: Rafael J. Wysocki <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]>
1 parent 7d625e5 commit 5e557cb

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/acpi/bus.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -498,24 +498,24 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
498498
acpi_evaluate_ost(handle, type, ost_code, NULL);
499499
}
500500

501-
static void acpi_device_notify(acpi_handle handle, u32 event, void *data)
501+
static void acpi_notify_device(acpi_handle handle, u32 event, void *data)
502502
{
503503
struct acpi_device *device = data;
504504

505505
device->driver->ops.notify(device, event);
506506
}
507507

508-
static void acpi_device_notify_fixed(void *data)
508+
static void acpi_notify_device_fixed(void *data)
509509
{
510510
struct acpi_device *device = data;
511511

512512
/* Fixed hardware devices have no handles */
513-
acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
513+
acpi_notify_device(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
514514
}
515515

516516
static u32 acpi_device_fixed_event(void *data)
517517
{
518-
acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data);
518+
acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_notify_device_fixed, data);
519519
return ACPI_INTERRUPT_HANDLED;
520520
}
521521

@@ -536,7 +536,7 @@ static int acpi_device_install_notify_handler(struct acpi_device *device)
536536
else
537537
status = acpi_install_notify_handler(device->handle,
538538
ACPI_DEVICE_NOTIFY,
539-
acpi_device_notify,
539+
acpi_notify_device,
540540
device);
541541

542542
if (ACPI_FAILURE(status))
@@ -554,7 +554,7 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device)
554554
acpi_device_fixed_event);
555555
else
556556
acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
557-
acpi_device_notify);
557+
acpi_notify_device);
558558
}
559559

560560
/* Handle events targeting \_SB device (at present only graceful shutdown) */

0 commit comments

Comments
 (0)