aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2007-07-18 22:45:40 -0400
committerLen Brown <len.brown@intel.com>2007-07-21 23:47:46 -0400
commit996fba08db7faf46b1a674957f60cd772ecd29ec (patch)
tree0420ce9a00b46abe7c20901347550fb973e2a297 /drivers/misc
parent741553c2d29b4075d636a38792c05cd2fc62bd8a (diff)
ACPI: thinkpad-acpi: rename pci HID constant
Rename an internal driver constant, on request by Len Brown. Also, document exactly what it is for. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/thinkpad_acpi.c7
-rw-r--r--drivers/misc/thinkpad_acpi.h1
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index c1e6a01d0857..78e41102a95c 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -2026,7 +2026,10 @@ static struct tp_acpi_drv_struct ibm_dock_acpidriver[2] = {
2026 .type = ACPI_SYSTEM_NOTIFY, 2026 .type = ACPI_SYSTEM_NOTIFY,
2027 }, 2027 },
2028 { 2028 {
2029 .hid = IBM_PCI_HID, 2029 /* THIS ONE MUST NEVER BE USED FOR DRIVER AUTOLOADING.
2030 * We just use it to get notifications of dock hotplug
2031 * in very old thinkpads */
2032 .hid = PCI_ROOT_HID_STRING,
2030 .notify = dock_notify, 2033 .notify = dock_notify,
2031 .handle = &pci_handle, 2034 .handle = &pci_handle,
2032 .type = ACPI_SYSTEM_NOTIFY, 2035 .type = ACPI_SYSTEM_NOTIFY,
@@ -2085,7 +2088,7 @@ static int __init dock_init2(struct ibm_init_struct *iibm)
2085static void dock_notify(struct ibm_struct *ibm, u32 event) 2088static void dock_notify(struct ibm_struct *ibm, u32 event)
2086{ 2089{
2087 int docked = dock_docked(); 2090 int docked = dock_docked();
2088 int pci = ibm->acpi->hid && strstr(ibm->acpi->hid, IBM_PCI_HID); 2091 int pci = ibm->acpi->hid && strstr(ibm->acpi->hid, PCI_ROOT_HID_STRING);
2089 2092
2090 if (event == 1 && !pci) /* 570 */ 2093 if (event == 1 && !pci) /* 570 */
2091 acpi_bus_generate_event(ibm->acpi->device, event, 1); /* button */ 2094 acpi_bus_generate_event(ibm->acpi->device, event, 1); /* button */
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index c5c1316ae3a6..fee04214a10b 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -107,7 +107,6 @@ static const char *str_supported(int is_supported);
107 107
108/* ACPI HIDs */ 108/* ACPI HIDs */
109#define IBM_HKEY_HID "IBM0068" 109#define IBM_HKEY_HID "IBM0068"
110#define IBM_PCI_HID "PNP0A03"
111 110
112/* ACPI helpers */ 111/* ACPI helpers */
113static int __must_check acpi_evalf(acpi_handle handle, 112static int __must_check acpi_evalf(acpi_handle handle,