Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0b36fc5 authored by Kay Sievers's avatar Kay Sievers Committed by Len Brown
Browse files

ACPI: thinkpad-acpi: struct device - replace bus_id with dev_name(), dev_set_name() 



Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Acked-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 9abf0eea

drivers/platform/x86/thinkpad_acpi.c

+4 −4
Original line number Diff line number Diff line
@@ -2375,7 +2375,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) 
		/* forward it to userspace, maybe it knows how to handle it */

		acpi_bus_generate_netlink_event(

					ibm->acpi->device->pnp.device_class,

					ibm->acpi->device->dev.bus_id,

					dev_name(&ibm->acpi->device->dev),

					event, 0);

		return;

	}
@@ -2505,7 +2505,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) 
		if (!ignore_acpi_ev && send_acpi_ev) {

			acpi_bus_generate_netlink_event(

					ibm->acpi->device->pnp.device_class,

					ibm->acpi->device->dev.bus_id,

					dev_name(&ibm->acpi->device->dev),

					event, hkey);

		}

	}
@@ -3724,7 +3724,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event) 
	}

	acpi_bus_generate_proc_event(ibm->acpi->device, event, data);

	acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,

					  ibm->acpi->device->dev.bus_id,

					  dev_name(&ibm->acpi->device->dev),

					  event, data);

}
@@ -3826,7 +3826,7 @@ static void bay_notify(struct ibm_struct *ibm, u32 event) 
{

	acpi_bus_generate_proc_event(ibm->acpi->device, event, 0);

	acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,

					  ibm->acpi->device->dev.bus_id,

					  dev_name(&ibm->acpi->device->dev),

					  event, 0);

}