From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org,
Hugh Dickins <hugh.dickins@tiscali.co.uk>,
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>,
Lin Ming <ming.m.lin@intel.com>,
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH v3 5/8] ACPI: remove acpi_device.flags.compatible_ids
Date: Mon, 21 Sep 2009 13:35:24 -0600 [thread overview]
Message-ID: <20090921193524.21656.21804.stgit@bob.kio> (raw)
In-Reply-To: <20090921193417.21656.32718.stgit@bob.kio>
We now keep a single list of IDs that includes both the _HID and any
_CIDs. We no longer need to keep track of whether the device has a _CID.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
drivers/acpi/scan.c | 15 ++++-----------
include/acpi/acpi_bus.h | 3 +--
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 9c65244..954cb1d 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -47,7 +47,7 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
int count;
struct acpi_hardware_id *id;
- if (!acpi_dev->flags.hardware_id && !acpi_dev->flags.compatible_ids)
+ if (!acpi_dev->flags.hardware_id)
return -ENODEV;
len = snprintf(modalias, size, "acpi:");
@@ -209,7 +209,7 @@ static int acpi_device_setup_files(struct acpi_device *dev)
goto end;
}
- if (dev->flags.hardware_id || dev->flags.compatible_ids) {
+ if (dev->flags.hardware_id) {
result = device_create_file(&dev->dev, &dev_attr_modalias);
if (result)
goto end;
@@ -239,7 +239,7 @@ static void acpi_device_remove_files(struct acpi_device *dev)
if (ACPI_SUCCESS(status))
device_remove_file(&dev->dev, &dev_attr_eject);
- if (dev->flags.hardware_id || dev->flags.compatible_ids)
+ if (dev->flags.hardware_id)
device_remove_file(&dev->dev, &dev_attr_modalias);
if (dev->flags.hardware_id)
@@ -876,11 +876,6 @@ static int acpi_bus_get_flags(struct acpi_device *device)
if (ACPI_SUCCESS(status))
device->flags.dynamic_status = 1;
- /* Presence of _CID indicates 'compatible_ids' */
- status = acpi_get_handle(device->handle, "_CID", &temp);
- if (ACPI_SUCCESS(status))
- device->flags.compatible_ids = 1;
-
/* Presence of _RMV indicates 'removable' */
status = acpi_get_handle(device->handle, "_RMV", &temp);
if (ACPI_SUCCESS(status))
@@ -1124,10 +1119,8 @@ static void acpi_device_set_id(struct acpi_device *device)
if (cid_list)
for (i = 0; i < cid_list->count; i++)
acpi_add_id(device, cid_list->ids[i].string);
- if (cid_add) {
+ if (cid_add)
acpi_add_id(device, cid_add);
- device->flags.compatible_ids = 1;
- }
kfree(info);
}
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 635e305..e422547 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -142,7 +142,6 @@ struct acpi_device_status {
struct acpi_device_flags {
u32 dynamic_status:1;
u32 hardware_id:1;
- u32 compatible_ids:1;
u32 bus_address:1;
u32 unique_id:1;
u32 removable:1;
@@ -153,7 +152,7 @@ struct acpi_device_flags {
u32 performance_manageable:1;
u32 wake_capable:1; /* Wakeup(_PRW) supported? */
u32 force_power_state:1;
- u32 reserved:19;
+ u32 reserved:20;
};
/* File System */
next prev parent reply other threads:[~2009-09-21 19:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-21 19:34 [PATCH v3 0/8] ACPI: make every acpi_device have a HID Bjorn Helgaas
2009-09-21 19:35 ` [PATCH v3 1/8] ACPI: fix synthetic HID for \_SB_ Bjorn Helgaas
2009-09-23 2:21 ` ykzhao
2009-09-23 16:19 ` Bjorn Helgaas
2009-09-24 1:44 ` ykzhao
2009-09-24 3:36 ` Bjorn Helgaas
2009-09-24 5:22 ` ykzhao
2009-09-24 21:42 ` Bjorn Helgaas
2009-09-21 19:35 ` [PATCH v3 2/8] ACPI: use acpi_device_hid() when possible Bjorn Helgaas
2009-09-21 19:35 ` [PATCH v3 3/8] ACPI: make sure every acpi_device has an ID Bjorn Helgaas
2009-09-21 19:35 ` [PATCH v3 4/8] ACPI: maintain a single list of _HID and _CID IDs Bjorn Helgaas
2009-09-21 19:35 ` Bjorn Helgaas [this message]
2009-09-21 19:35 ` [PATCH v3 6/8] ACPI: remove acpi_device.flags.hardware_id Bjorn Helgaas
2009-09-21 19:35 ` [PATCH v3 7/8] ACPI: remove acpi_device_uid() and related stuff Bjorn Helgaas
2009-09-21 19:35 ` [PATCH v3 8/8] ACPI: simplify building device HID/CID list Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090921193524.21656.21804.stgit@bob.kio \
--to=bjorn.helgaas@hp.com \
--cc=Valdis.Kletnieks@vt.edu \
--cc=bzolnier@gmail.com \
--cc=hugh.dickins@tiscali.co.uk \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=ming.m.lin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox