From patchwork Mon Sep 21 19:35:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 49115 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8LJZWel009965 for ; Mon, 21 Sep 2009 19:35:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753421AbZIUTfh (ORCPT ); Mon, 21 Sep 2009 15:35:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753222AbZIUTfh (ORCPT ); Mon, 21 Sep 2009 15:35:37 -0400 Received: from g1t0026.austin.hp.com ([15.216.28.33]:35495 "EHLO g1t0026.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753421AbZIUTfg (ORCPT ); Mon, 21 Sep 2009 15:35:36 -0400 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g1t0026.austin.hp.com (Postfix) with ESMTP id 89159C2F2; Mon, 21 Sep 2009 19:35:40 +0000 (UTC) Received: from ldl (linux.corp.hp.com [15.11.146.101]) by g1t0038.austin.hp.com (Postfix) with ESMTP id 6208430120; Mon, 21 Sep 2009 19:35:40 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 47929CF000E; Mon, 21 Sep 2009 13:35:40 -0600 (MDT) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JJJ-xAelB0sL; Mon, 21 Sep 2009 13:35:40 -0600 (MDT) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 26031CF000D; Mon, 21 Sep 2009 13:35:40 -0600 (MDT) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 225472615C; Mon, 21 Sep 2009 13:35:40 -0600 (MDT) Subject: [PATCH v3 8/8] ACPI: simplify building device HID/CID list To: Len Brown From: Bjorn Helgaas Cc: linux-acpi@vger.kernel.org, Hugh Dickins , Valdis Kletnieks , Lin Ming , Bartlomiej Zolnierkiewicz Date: Mon, 21 Sep 2009 13:35:40 -0600 Message-ID: <20090921193540.21656.98833.stgit@bob.kio> In-Reply-To: <20090921193417.21656.32718.stgit@bob.kio> References: <20090921193417.21656.32718.stgit@bob.kio> User-Agent: StGit/0.14.3.386.gb02d MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Minor code cleanup, no functional change. Instead of remembering what HIDs & CIDs to add later, just add them immediately. Signed-off-by: Bjorn Helgaas --- drivers/acpi/scan.c | 56 +++++++++++++++++++++------------------------------ 1 files changed, 23 insertions(+), 33 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 6880852..1ef5b7e 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1015,21 +1015,19 @@ static void acpi_add_id(struct acpi_device *device, const char *dev_id) static void acpi_device_set_id(struct acpi_device *device) { - struct acpi_device_info *info = NULL; - char *hid = NULL; - struct acpica_device_id_list *cid_list = NULL; - char *cid_add = NULL; acpi_status status; + struct acpi_device_info *info; + struct acpica_device_id_list *cid_list; int i; switch (device->device_type) { case ACPI_BUS_TYPE_DEVICE: if (ACPI_IS_ROOT_DEVICE(device)) { - hid = ACPI_SYSTEM_HID; + acpi_add_id(device, ACPI_SYSTEM_HID); break; } else if (ACPI_IS_ROOT_DEVICE(device->parent)) { /* \_SB_, the only root-level namespace device */ - hid = ACPI_BUS_HID; + acpi_add_id(device, ACPI_BUS_HID); strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME); strcpy(device->pnp.device_class, ACPI_BUS_CLASS); break; @@ -1042,41 +1040,43 @@ static void acpi_device_set_id(struct acpi_device *device) } if (info->valid & ACPI_VALID_HID) - hid = info->hardware_id.string; - if (info->valid & ACPI_VALID_CID) + acpi_add_id(device, info->hardware_id.string); + if (info->valid & ACPI_VALID_CID) { cid_list = &info->compatible_id_list; + for (i = 0; i < cid_list->count; i++) + acpi_add_id(device, cid_list->ids[i].string); + } if (info->valid & ACPI_VALID_ADR) { device->pnp.bus_address = info->address; device->flags.bus_address = 1; } - /* If we have a video/bay/dock device, add our selfdefined - HID to the CID list. Like that the video/bay/dock drivers - will get autoloaded and the device might still match - against another driver. - */ + /* + * Some devices don't reliably have _HIDs & _CIDs, so add + * synthetic HIDs to make sure drivers can find them. + */ if (acpi_is_video_device(device)) - cid_add = ACPI_VIDEO_HID; + acpi_add_id(device, ACPI_VIDEO_HID); else if (ACPI_SUCCESS(acpi_bay_match(device))) - cid_add = ACPI_BAY_HID; + acpi_add_id(device, ACPI_BAY_HID); else if (ACPI_SUCCESS(acpi_dock_match(device))) - cid_add = ACPI_DOCK_HID; + acpi_add_id(device, ACPI_DOCK_HID); break; case ACPI_BUS_TYPE_POWER: - hid = ACPI_POWER_HID; + acpi_add_id(device, ACPI_POWER_HID); break; case ACPI_BUS_TYPE_PROCESSOR: - hid = ACPI_PROCESSOR_OBJECT_HID; + acpi_add_id(device, ACPI_PROCESSOR_OBJECT_HID); break; case ACPI_BUS_TYPE_THERMAL: - hid = ACPI_THERMAL_HID; + acpi_add_id(device, ACPI_THERMAL_HID); break; case ACPI_BUS_TYPE_POWER_BUTTON: - hid = ACPI_BUTTON_HID_POWERF; + acpi_add_id(device, ACPI_BUTTON_HID_POWERF); break; case ACPI_BUS_TYPE_SLEEP_BUTTON: - hid = ACPI_BUTTON_HID_SLEEPF; + acpi_add_id(device, ACPI_BUTTON_HID_SLEEPF); break; } @@ -1087,18 +1087,8 @@ static void acpi_device_set_id(struct acpi_device *device) * This generic ID isn't useful for driver binding, but it provides * the useful property that "every acpi_device has an ID." */ - if (!hid && !cid_list && !cid_add) - hid = "device"; - - if (hid) - acpi_add_id(device, hid); - if (cid_list) - for (i = 0; i < cid_list->count; i++) - acpi_add_id(device, cid_list->ids[i].string); - if (cid_add) - acpi_add_id(device, cid_add); - - kfree(info); + if (list_empty(&device->pnp.ids)) + acpi_add_id(device, "device"); } static int acpi_device_set_context(struct acpi_device *device)