AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ACPI: thinkpad-acpi: rename pci HID constant

Browse Source 
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>
This commit is contained in:
Henrique de Moraes Holschuh 2007-07-18 23:45:40 -03:00 committed by Len Brown
parent 741553c2d2
commit 996fba08db
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/misc/thinkpad_acpi.c
View File

@ -2026,7 +2026,10 @@ static struct tp_acpi_drv_struct ibm_dock_acpidriver[2] = {
.type = ACPI_SYSTEM_NOTIFY, .type = ACPI_SYSTEM_NOTIFY,
}, },
{ {
.hid = IBM_PCI_HID, /* THIS ONE MUST NEVER BE USED FOR DRIVER AUTOLOADING.
* We just use it to get notifications of dock hotplug
* in very old thinkpads */
.hid = PCI_ROOT_HID_STRING,
.notify = dock_notify, .notify = dock_notify,
.handle = &pci_handle, .handle = &pci_handle,
.type = ACPI_SYSTEM_NOTIFY, .type = ACPI_SYSTEM_NOTIFY,
@ -2085,7 +2088,7 @@ static int __init dock_init2(struct ibm_init_struct *iibm)
static void dock_notify(struct ibm_struct *ibm, u32 event) static void dock_notify(struct ibm_struct *ibm, u32 event)
{ {
int docked = dock_docked(); int docked = dock_docked();
int pci = ibm->acpi->hid && strstr(ibm->acpi->hid, IBM_PCI_HID); int pci = ibm->acpi->hid && strstr(ibm->acpi->hid, PCI_ROOT_HID_STRING);
if (event == 1 && !pci) /* 570 */ if (event == 1 && !pci) /* 570 */
acpi_bus_generate_event(ibm->acpi->device, event, 1); /* button */ acpi_bus_generate_event(ibm->acpi->device, event, 1); /* button */

1
drivers/misc/thinkpad_acpi.h
View File

@ -107,7 +107,6 @@ static const char *str_supported(int is_supported);
/* ACPI HIDs */ /* ACPI HIDs */
#define IBM_HKEY_HID "IBM0068" #define IBM_HKEY_HID "IBM0068"
#define IBM_PCI_HID "PNP0A03"
/* ACPI helpers */ /* ACPI helpers */
static int __must_check acpi_evalf(acpi_handle handle, static int __must_check acpi_evalf(acpi_handle handle,