From patchwork Mon Sep 21 19:35:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 49110 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 n8LJZI2v009926 for ; Mon, 21 Sep 2009 19:35:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753366AbZIUTfM (ORCPT ); Mon, 21 Sep 2009 15:35:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753369AbZIUTfM (ORCPT ); Mon, 21 Sep 2009 15:35:12 -0400 Received: from g4t0014.houston.hp.com ([15.201.24.17]:4616 "EHLO g4t0014.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753366AbZIUTfL (ORCPT ); Mon, 21 Sep 2009 15:35:11 -0400 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g4t0014.houston.hp.com (Postfix) with ESMTP id 4549F243E4; Mon, 21 Sep 2009 19:35:15 +0000 (UTC) Received: from ldl (linux.corp.hp.com [15.11.146.101]) by g1t0038.austin.hp.com (Postfix) with ESMTP id E281030125; Mon, 21 Sep 2009 19:35:14 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id C37E6CF000E; Mon, 21 Sep 2009 13:35:14 -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 ABr0oGtiyiDi; Mon, 21 Sep 2009 13:35:14 -0600 (MDT) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id AD868CF000D; Mon, 21 Sep 2009 13:35:14 -0600 (MDT) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 9E6AC2615C; Mon, 21 Sep 2009 13:35:14 -0600 (MDT) Subject: [PATCH v3 3/8] ACPI: make sure every acpi_device has an ID 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:14 -0600 Message-ID: <20090921193514.21656.49883.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 This makes sure every acpi_device has at least one ID. If we build an acpi_device for a namespace node with no _HID or _CID, we sometimes synthesize an ID like "LNXCPU" or "LNXVIDEO". If we don't even have that, give it a default "device" ID. Note that this means things like: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/HWP0001:00/HWP0002:04/device:00 (a PCI slot SxFy device) will have "hid" and "modprobe" entries, where they didn't before. These aren't very useful (a HID of "device" doesn't tell you what *kind* of device it is, so it doesn't help find a driver), but I don't think they're harmful. Signed-off-by: Bjorn Helgaas --- drivers/acpi/scan.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 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 269c0aa..53b96e7 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1155,6 +1155,16 @@ static void acpi_device_set_id(struct acpi_device *device) break; } + /* + * We build acpi_devices for some objects that don't have _HID or _CID, + * e.g., PCI bridges and slots. Drivers can't bind to these objects, + * but we do use them indirectly by traversing the acpi_device tree. + * 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) { device->pnp.hardware_id = ACPI_ALLOCATE_ZEROED(strlen (hid) + 1); if (device->pnp.hardware_id) {