Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753872AbZKAWgs (ORCPT ); Sun, 1 Nov 2009 17:36:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753680AbZKAWgs (ORCPT ); Sun, 1 Nov 2009 17:36:48 -0500 Received: from mail-yw0-f202.google.com ([209.85.211.202]:57637 "EHLO mail-yw0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753595AbZKAWgr (ORCPT ); Sun, 1 Nov 2009 17:36:47 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=IvxLtQzhs+DAx/rGnp+7+6jhZMDRpe+z9AmeOEXK0MW395Me4v9J1rbhx7frdblKUM 6u45slLW/LfDzL/y0dmaQ/61NHYy1NE16qyCreAfJg5skII08rMLiAfQ2FmnGWZzw70A iFPZ3CAFkexogfQx3slU7ei5AH2JQkfI6scPY= From: Thiago Farina To: trivial@kernel.org Cc: lenb@kernel.org, ming.m.lin@intel.com, robert.moore@intel.com, jkosina@suze.cz, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Thiago Farina Subject: [PATCH] trivial: remove ACPI_ARRAY_LENGTH macro. Date: Sun, 1 Nov 2009 17:36:12 -0500 Message-Id: <1257114972-16039-1-git-send-email-tfransosi@gmail.com> X-Mailer: git-send-email 1.6.5.1.61.ge79999 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2643 Lines: 68 Since the kernel already has a macro (ARRAY_SIZE) that does the same thing, just use it instead of defining another macro for the same propose. Signed-off-by: Thiago Farina --- drivers/acpi/acpica/hwvalid.c | 2 +- drivers/acpi/acpica/uteval.c | 4 ++-- include/acpi/actypes.h | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c index ec33f27..ca2eb02 100644 --- a/drivers/acpi/acpica/hwvalid.c +++ b/drivers/acpi/acpica/hwvalid.c @@ -103,7 +103,7 @@ static const struct acpi_port_info acpi_protected_ports[] = { {"PCI", 0x0CF8, 0x0CFF, ACPI_OSI_WIN_XP} }; -#define ACPI_PORT_INFO_ENTRIES ACPI_ARRAY_LENGTH (acpi_protected_ports) +#define ACPI_PORT_INFO_ENTRIES ARRAY_SIZE(acpi_protected_ports) /****************************************************************************** * diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c index 5d54e36..54efbaa 100644 --- a/drivers/acpi/acpica/uteval.c +++ b/drivers/acpi/acpica/uteval.c @@ -126,7 +126,7 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state) /* Compare input string to static table of supported interfaces */ - for (i = 0; i < ACPI_ARRAY_LENGTH(acpi_interfaces_supported); i++) { + for (i = 0; i < ARRAY_SIZE(acpi_interfaces_supported); i++) { if (!ACPI_STRCMP(string_desc->string.pointer, acpi_interfaces_supported[i].name)) { /* @@ -186,7 +186,7 @@ acpi_status acpi_osi_invalidate(char *interface) { int i; - for (i = 0; i < ACPI_ARRAY_LENGTH(acpi_interfaces_supported); i++) { + for (i = 0; i < ARRAY_SIZE(acpi_interfaces_supported); i++) { if (!ACPI_STRCMP(interface, acpi_interfaces_supported[i].name)) { *acpi_interfaces_supported[i].name = '\0'; return AE_OK; diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 153f12d..641d746 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -441,10 +441,6 @@ typedef unsigned long long acpi_integer; #define ACPI_MIN(a,b) (((a)<(b))?(a):(b)) #define ACPI_MAX(a,b) (((a)>(b))?(a):(b)) -/* Size calculation */ - -#define ACPI_ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0])) - /* Pointer manipulation */ #define ACPI_CAST_PTR(t, p) ((t *) (acpi_uintptr_t) (p)) -- 1.6.5.1.61.ge79999 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/