releases/upstream/2.6.29-rc2/0003-ACPI-thinkpad-acpi-struct-device-replace-bus_id.patch

   1 From e0b36fc5efd610a208b6b80e821a49302ca424ab Mon Sep 17 00:00:00 2001
   2 From: Kay Sievers <kay.sievers@vrfy.org>
   3 Date: Sun, 11 Jan 2009 03:00:59 -0200
   4 Subject: ACPI: thinkpad-acpi: struct device - replace bus_id with dev_name(), dev_set_name()
   5
   6 Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
   7 Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
   8 Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
   9 Signed-off-by: Len Brown <len.brown@intel.com>
  10 ---
  11  drivers/platform/x86/thinkpad_acpi.c |    8 ++++----
  12  1 files changed, 4 insertions(+), 4 deletions(-)
  13
  14 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
  15 index 3478453..ee3fa00 100644
  16 --- a/drivers/platform/x86/thinkpad_acpi.c
  17 +++ b/drivers/platform/x86/thinkpad_acpi.c
  18 @@ -2375,7 +2375,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
  19                 /* forward it to userspace, maybe it knows how to handle it */
  20                 acpi_bus_generate_netlink_event(
  21                                         ibm->acpi->device->pnp.device_class,
  22 -                                       ibm->acpi->device->dev.bus_id,
  23 +                                       dev_name(&ibm->acpi->device->dev),
  24                                         event, 0);
  25                 return;
  26         }
  27 @@ -2505,7 +2505,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
  28                 if (!ignore_acpi_ev && send_acpi_ev) {
  29                         acpi_bus_generate_netlink_event(
  30                                         ibm->acpi->device->pnp.device_class,
  31 -                                       ibm->acpi->device->dev.bus_id,
  32 +                                       dev_name(&ibm->acpi->device->dev),
  33                                         event, hkey);
  34                 }
  35         }
  36 @@ -3724,7 +3724,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event)
  37         }
  38         acpi_bus_generate_proc_event(ibm->acpi->device, event, data);
  39         acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
  40 -                                         ibm->acpi->device->dev.bus_id,
  41 +                                         dev_name(&ibm->acpi->device->dev),
  42                                           event, data);
  43  }
  44
  45 @@ -3826,7 +3826,7 @@ static void bay_notify(struct ibm_struct *ibm, u32 event)
  46  {
  47         acpi_bus_generate_proc_event(ibm->acpi->device, event, 0);
  48         acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
  49 -                                         ibm->acpi->device->dev.bus_id,
  50 +                                         dev_name(&ibm->acpi->device->dev),
  51                                           event, 0);
  52  }
  53
  54 --
  55 1.5.6.5
  56