diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-11 00:00:59 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-01-15 13:28:26 -0500 |
commit | e0b36fc5efd610a208b6b80e821a49302ca424ab (patch) | |
tree | f6edde8b97687c3fd30141da15ff53f3f5212b6f | |
parent | 9abf0eea877d6107d3a8a5c6913450e961fb7050 (diff) |
ACPI: thinkpad-acpi: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 3478453eba7a..ee3fa007f312 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
@@ -2375,7 +2375,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) | |||
2375 | /* forward it to userspace, maybe it knows how to handle it */ | 2375 | /* forward it to userspace, maybe it knows how to handle it */ |
2376 | acpi_bus_generate_netlink_event( | 2376 | acpi_bus_generate_netlink_event( |
2377 | ibm->acpi->device->pnp.device_class, | 2377 | ibm->acpi->device->pnp.device_class, |
2378 | ibm->acpi->device->dev.bus_id, | 2378 | dev_name(&ibm->acpi->device->dev), |
2379 | event, 0); | 2379 | event, 0); |
2380 | return; | 2380 | return; |
2381 | } | 2381 | } |
@@ -2505,7 +2505,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) | |||
2505 | if (!ignore_acpi_ev && send_acpi_ev) { | 2505 | if (!ignore_acpi_ev && send_acpi_ev) { |
2506 | acpi_bus_generate_netlink_event( | 2506 | acpi_bus_generate_netlink_event( |
2507 | ibm->acpi->device->pnp.device_class, | 2507 | ibm->acpi->device->pnp.device_class, |
2508 | ibm->acpi->device->dev.bus_id, | 2508 | dev_name(&ibm->acpi->device->dev), |
2509 | event, hkey); | 2509 | event, hkey); |
2510 | } | 2510 | } |
2511 | } | 2511 | } |
@@ -3724,7 +3724,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event) | |||
3724 | } | 3724 | } |
3725 | acpi_bus_generate_proc_event(ibm->acpi->device, event, data); | 3725 | acpi_bus_generate_proc_event(ibm->acpi->device, event, data); |
3726 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, | 3726 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, |
3727 | ibm->acpi->device->dev.bus_id, | 3727 | dev_name(&ibm->acpi->device->dev), |
3728 | event, data); | 3728 | event, data); |
3729 | } | 3729 | } |
3730 | 3730 | ||
@@ -3826,7 +3826,7 @@ static void bay_notify(struct ibm_struct *ibm, u32 event) | |||
3826 | { | 3826 | { |
3827 | acpi_bus_generate_proc_event(ibm->acpi->device, event, 0); | 3827 | acpi_bus_generate_proc_event(ibm->acpi->device, event, 0); |
3828 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, | 3828 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, |
3829 | ibm->acpi->device->dev.bus_id, | 3829 | dev_name(&ibm->acpi->device->dev), |
3830 | event, 0); | 3830 | event, 0); |
3831 | } | 3831 | } |
3832 | 3832 | ||