summaryrefslogtreecommitdiffstats
path: root/drivers/pnp
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-09-21 13:35:29 -0600
committerLen Brown <len.brown@intel.com>2009-09-25 15:09:48 -0400
commit1131b938f0757350f569f8ad5bee737cd02b8e58 (patch)
tree679f4ff97f6858f18af7c86807644dc8144512f0 /drivers/pnp
parentb2972f87508a21db7584d11fdb5c97cb7101a788 (diff)
downloadop-kernel-dev-1131b938f0757350f569f8ad5bee737cd02b8e58.zip
op-kernel-dev-1131b938f0757350f569f8ad5bee737cd02b8e58.tar.gz
ACPI: remove acpi_device.flags.hardware_id
Every acpi_device has at least one ID (if there's no _HID or _CID, we give it a synthetic or default ID). So there's no longer a need to check whether an ID exists; we can just use it. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp')
-rw-r--r--drivers/pnp/pnpacpi/core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 3a4478f..83b8b5a 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -230,8 +230,7 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp)
struct pnp_dev *pnp = _pnp;
/* true means it matched */
- return acpi->flags.hardware_id
- && !acpi_get_physical_device(acpi->handle)
+ return !acpi_get_physical_device(acpi->handle)
&& compare_pnp_id(pnp->id, acpi_device_hid(acpi));
}
OpenPOWER on IntegriCloud