From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Randy.Dunlap" Subject: [PATCH] debug.c: don't invent NUM_OF Date: Fri, 07 Jan 2005 09:14:04 -0800 Message-ID: <41DEC35C.9020604@osdl.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060700050908090100090101" Return-path: Sender: acpi-devel-admin-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: acpi-devel-admin-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , List-Archive: To: acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org List-Id: linux-acpi@vger.kernel.org This is a multi-part message in MIME format. --------------060700050908090100090101 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Use kernel.h for ARRAY_SIZE() instead of using local NUM_OF(). I.e., use kernel-supplied functions or macros when available. Signed-off-by: Randy Dunlap diffstat:= drivers/acpi/debug.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- --------------060700050908090100090101 Content-Type: text/x-patch; name="acpi_array_size.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="acpi_array_size.patch" diff -Naurp ./drivers/acpi/debug.c~acpi_array_size ./drivers/acpi/debug.c --- ./drivers/acpi/debug.c~acpi_array_size 2004-12-24 13:35:23.000000000 -0800 +++ ./drivers/acpi/debug.c 2005-01-07 07:56:19.279389952 -0800 @@ -4,6 +4,7 @@ #include #include +#include #include #include #include @@ -87,7 +88,6 @@ const struct acpi_dlevel acpi_debug_leve ACPI_DEBUG_INIT(ACPI_LV_FULL_TABLES), ACPI_DEBUG_INIT(ACPI_LV_EVENTS), }; -#define NUM_OF(v) ( sizeof(v)/sizeof(v[0]) ) static int acpi_system_read_debug ( @@ -109,7 +109,7 @@ acpi_system_read_debug ( switch ((unsigned long) data) { case 0: - for (i = 0; i < NUM_OF(acpi_debug_layers); i++) { + for (i = 0; i < ARRAY_SIZE(acpi_debug_layers); i++) { p += sprintf(p, "%-25s\t0x%08lX [%c]\n", acpi_debug_layers[i].name, acpi_debug_layers[i].value, @@ -126,7 +126,7 @@ acpi_system_read_debug ( acpi_dbg_layer); break; case 1: - for (i = 0; i < NUM_OF(acpi_debug_levels); i++) { + for (i = 0; i < ARRAY_SIZE(acpi_debug_levels); i++) { p += sprintf(p, "%-25s\t0x%08lX [%c]\n", acpi_debug_levels[i].name, acpi_debug_levels[i].value, --------------060700050908090100090101-- ------------------------------------------------------- The SF.Net email is sponsored by: Beat the post-holiday blues Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek. It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt