From 4482386c4a69f658cf539fc0503f8fca38157d56 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Mon, 21 Sep 2009 13:35:09 -0600 Subject: [PATCH] --- yaml --- r: 166390 b: refs/heads/master c: ea8d82fd316208bd0ffe6f64823d04bcb8c57158 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 6 +++--- trunk/drivers/pnp/pnpacpi/core.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 25f76266afc1..a17d8cde0f07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78b8e141f8458ba0b8ac53c45bc327112c53887e +refs/heads/master: ea8d82fd316208bd0ffe6f64823d04bcb8c57158 diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index e9227ea2cb2f..269c0aae4bed 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -185,7 +185,7 @@ static ssize_t acpi_device_hid_show(struct device *dev, struct device_attribute *attr, char *buf) { struct acpi_device *acpi_dev = to_acpi_device(dev); - return sprintf(buf, "%s\n", acpi_dev->pnp.hardware_id); + return sprintf(buf, "%s\n", acpi_device_hid(acpi_dev)); } static DEVICE_ATTR(hid, 0444, acpi_device_hid_show, NULL); @@ -501,7 +501,7 @@ static int acpi_device_register(struct acpi_device *device) * If failed, create one and link it into acpi_bus_id_list */ list_for_each_entry(acpi_device_bus_id, &acpi_bus_id_list, node) { - if(!strcmp(acpi_device_bus_id->bus_id, device->flags.hardware_id? device->pnp.hardware_id : "device")) { + if (!strcmp(acpi_device_bus_id->bus_id, device->flags.hardware_id ? acpi_device_hid(device) : "device")) { acpi_device_bus_id->instance_no ++; found = 1; kfree(new_bus_id); @@ -510,7 +510,7 @@ static int acpi_device_register(struct acpi_device *device) } if (!found) { acpi_device_bus_id = new_bus_id; - strcpy(acpi_device_bus_id->bus_id, device->flags.hardware_id ? device->pnp.hardware_id : "device"); + strcpy(acpi_device_bus_id->bus_id, device->flags.hardware_id ? acpi_device_hid(device) : "device"); acpi_device_bus_id->instance_no = 0; list_add_tail(&acpi_device_bus_id->node, &acpi_bus_id_list); } diff --git a/trunk/drivers/pnp/pnpacpi/core.c b/trunk/drivers/pnp/pnpacpi/core.c index c07fdb94d665..ff963d4dab46 100644 --- a/trunk/drivers/pnp/pnpacpi/core.c +++ b/trunk/drivers/pnp/pnpacpi/core.c @@ -234,7 +234,7 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp) /* true means it matched */ return acpi->flags.hardware_id && !acpi_get_physical_device(acpi->handle) - && compare_pnp_id(pnp->id, acpi->pnp.hardware_id); + && compare_pnp_id(pnp->id, acpi_device_hid(acpi)); } static int __init acpi_pnp_find_device(struct device *dev, acpi_handle * handle)