ACPI: use acpi_device_hid() when possible
Use acpi_device_hid() rather than accessing acpi_device.pnp.hardware_id directly. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
78b8e141f8
commit
ea8d82fd31
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue