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

ACPI: driver: Avoid using pnp.device_class for netlink handling 



Update several core ACPI device drivers that use
acpi_bus_generate_netlink_event() for generating netlink messages to
pass a string literal as its first argument instead of a pointer to
pnp.device_class in a given struct acpi_device, which will allow them
to avoid initializing the pnp.device_class field in the future.

The ACPI button driver that uses different acpi_device_class()
values for different button types will still pass it to
acpi_bus_generate_netlink_event(), but update it to use the
acpi_device_class() macro instead of open coding the pointer
access path.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/7944022.EvYhyI6sBW@rafael.j.wysocki
parent 69652f32

drivers/acpi/ac.c

+3 −3
Original line number Diff line number Diff line
@@ -130,9 +130,9 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) 
			msleep(ac_sleep_before_get_state_ms);



		acpi_ac_get_state(ac);

		acpi_bus_generate_netlink_event(adev->pnp.device_class,

		acpi_bus_generate_netlink_event(ACPI_AC_CLASS,

						dev_name(&adev->dev), event,

						  (u32) ac->state);

						ac->state);

		acpi_notifier_call_chain(ACPI_AC_CLASS, acpi_device_bid(adev),

					 event, ac->state);

		power_supply_changed(ac->charger);

drivers/acpi/acpi_pad.c

+2 −2
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static void acpi_pad_notify(acpi_handle handle, u32 event, void *data) 
	switch (event) {

	case ACPI_PROCESSOR_AGGREGATOR_NOTIFY:

		acpi_pad_handle_notify(handle);

		acpi_bus_generate_netlink_event(adev->pnp.device_class,

		acpi_bus_generate_netlink_event(ACPI_PROCESSOR_AGGREGATOR_CLASS,

						dev_name(&adev->dev), event, 0);

		break;

	default:

drivers/acpi/battery.c

+1 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data) 
	if (event == ACPI_BATTERY_NOTIFY_INFO)

		acpi_battery_refresh(battery);

	acpi_battery_update(battery, false);

	acpi_bus_generate_netlink_event(device->pnp.device_class,

	acpi_bus_generate_netlink_event(ACPI_BATTERY_CLASS,

					dev_name(&device->dev), event,

					acpi_battery_present(battery));

	acpi_notifier_call_chain(ACPI_BATTERY_CLASS, acpi_device_bid(device),

drivers/acpi/button.c

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) 
	input_report_key(input, keycode, 0);

	input_sync(input);



	acpi_bus_generate_netlink_event(device->pnp.device_class,

	acpi_bus_generate_netlink_event(acpi_device_class(device),

					dev_name(&device->dev),

					event, ++button->pushed);

}

drivers/acpi/processor_driver.c

+8 −14
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data) 
{

	struct acpi_device *device = data;

	struct acpi_processor *pr;

	int saved;

	int saved, ev_data = 0;



	if (device->handle != handle)

		return;
@@ -66,33 +66,27 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data) 
	case ACPI_PROCESSOR_NOTIFY_PERFORMANCE:

		saved = pr->performance_platform_limit;

		acpi_processor_ppc_has_changed(pr, 1);

		if (saved == pr->performance_platform_limit)

			break;

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event,

						  pr->performance_platform_limit);

		ev_data = pr->performance_platform_limit;

		if (saved == ev_data)

			return;



		break;

	case ACPI_PROCESSOR_NOTIFY_POWER:

		acpi_processor_power_state_has_changed(pr);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event, 0);

		break;

	case ACPI_PROCESSOR_NOTIFY_THROTTLING:

		acpi_processor_tstate_has_changed(pr);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event, 0);

		break;

	case ACPI_PROCESSOR_NOTIFY_HIGEST_PERF_CHANGED:

		cpufreq_update_limits(pr->id);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event, 0);

		break;

	default:

		acpi_handle_debug(handle, "Unsupported event [0x%x]\n", event);

		break;

		return;

	}



	return;

	acpi_bus_generate_netlink_event(ACPI_PROCESSOR_CLASS,

					dev_name(&device->dev), event, ev_data);

}



static int __acpi_processor_start(struct acpi_device *device);