From patchwork Mon Sep 21 19:35:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 49114 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 n8LJZWek009965 for ; Mon, 21 Sep 2009 19:35:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753419AbZIUTfc (ORCPT ); Mon, 21 Sep 2009 15:35:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753421AbZIUTfc (ORCPT ); Mon, 21 Sep 2009 15:35:32 -0400 Received: from g4t0017.houston.hp.com ([15.201.24.20]:48358 "EHLO g4t0017.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753419AbZIUTfb (ORCPT ); Mon, 21 Sep 2009 15:35:31 -0400 Received: from g1t0039.austin.hp.com (g1t0039.austin.hp.com [16.236.32.45]) by g4t0017.houston.hp.com (Postfix) with ESMTP id 8D7FD38199; Mon, 21 Sep 2009 19:35:35 +0000 (UTC) Received: from ldl (linux.corp.hp.com [15.11.146.101]) by g1t0039.austin.hp.com (Postfix) with ESMTP id 53F06340B3; Mon, 21 Sep 2009 19:35:35 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 2EFD3CF000E; Mon, 21 Sep 2009 13:35:35 -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 YAgSyO0CW8jn; Mon, 21 Sep 2009 13:35:35 -0600 (MDT) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 18CEFCF000D; Mon, 21 Sep 2009 13:35:35 -0600 (MDT) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 08E112615C; Mon, 21 Sep 2009 13:35:35 -0600 (MDT) Subject: [PATCH v3 7/8] ACPI: remove acpi_device_uid() and related stuff 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:35 -0600 Message-ID: <20090921193534.21656.66980.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 Nobody uses acpi_device_uid(), so this patch removes it. Signed-off-by: Bjorn Helgaas --- drivers/acpi/scan.c | 18 ------------------ include/acpi/acpi_bus.h | 4 +--- 2 files changed, 1 insertions(+), 21 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 3f9b8d0..6880852 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1017,7 +1017,6 @@ static void acpi_device_set_id(struct acpi_device *device) { struct acpi_device_info *info = NULL; char *hid = NULL; - char *uid = NULL; struct acpica_device_id_list *cid_list = NULL; char *cid_add = NULL; acpi_status status; @@ -1044,8 +1043,6 @@ 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_UID) - uid = info->unique_id.string; if (info->valid & ACPI_VALID_CID) cid_list = &info->compatible_id_list; if (info->valid & ACPI_VALID_ADR) { @@ -1095,16 +1092,6 @@ static void acpi_device_set_id(struct acpi_device *device) if (hid) acpi_add_id(device, hid); - if (uid) { - device->pnp.unique_id = ACPI_ALLOCATE_ZEROED(strlen (uid) + 1); - if (device->pnp.unique_id) { - strcpy(device->pnp.unique_id, uid); - device->flags.unique_id = 1; - } - } - if (!device->flags.unique_id) - device->pnp.unique_id = ""; - if (cid_list) for (i = 0; i < cid_list->count; i++) acpi_add_id(device, cid_list->ids[i].string); @@ -1199,11 +1186,6 @@ static int acpi_add_single_object(struct acpi_device **child, * ----------------- * TBD: Synch with Core's enumeration/initialization process. */ - - /* - * Hardware ID, Unique ID, & Bus Address - * ------------------------------------- - */ acpi_device_set_id(device); /* diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 1d205f5..b8f195d 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 bus_address:1; - u32 unique_id:1; u32 removable:1; u32 ejectable:1; u32 lockable:1; @@ -151,7 +150,7 @@ struct acpi_device_flags { u32 performance_manageable:1; u32 wake_capable:1; /* Wakeup(_PRW) supported? */ u32 force_power_state:1; - u32 reserved:21; + u32 reserved:22; }; /* File System */ @@ -186,7 +185,6 @@ struct acpi_device_pnp { #define acpi_device_bid(d) ((d)->pnp.bus_id) #define acpi_device_adr(d) ((d)->pnp.bus_address) char *acpi_device_hid(struct acpi_device *device); -#define acpi_device_uid(d) ((d)->pnp.unique_id) #define acpi_device_name(d) ((d)->pnp.device_name) #define acpi_device_class(d) ((d)->pnp.device_class)