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

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
...@@ -2375,7 +2375,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) ...@@ -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 */ /* forward it to userspace, maybe it knows how to handle it */
acpi_bus_generate_netlink_event( acpi_bus_generate_netlink_event(
ibm->acpi->device->pnp.device_class, ibm->acpi->device->pnp.device_class,
ibm->acpi->device->dev.bus_id, dev_name(&ibm->acpi->device->dev),
event, 0); event, 0);
return; return;
} }
...@@ -2505,7 +2505,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) ...@@ -2505,7 +2505,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
if (!ignore_acpi_ev && send_acpi_ev) { if (!ignore_acpi_ev && send_acpi_ev) {
acpi_bus_generate_netlink_event( acpi_bus_generate_netlink_event(
ibm->acpi->device->pnp.device_class, ibm->acpi->device->pnp.device_class,
ibm->acpi->device->dev.bus_id, dev_name(&ibm->acpi->device->dev),
event, hkey); event, hkey);
} }
} }
...@@ -3724,7 +3724,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event) ...@@ -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_proc_event(ibm->acpi->device, event, data);
acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, 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); event, data);
} }
...@@ -3826,7 +3826,7 @@ static void bay_notify(struct ibm_struct *ibm, u32 event) ...@@ -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_proc_event(ibm->acpi->device, event, 0);
acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, 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); event, 0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment