[PATCH] debug.c: don't invent NUM_OF

[PATCH] debug.c: don't invent NUM_OF

[Randy.Dunlap]

[-- Attachment #1: Type: text/plain, Size: 300 bytes --]


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 <rddunlap-3NddpPZAyC0@public.gmane.org>

diffstat:=
  drivers/acpi/debug.c |    6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)

---

[-- Attachment #2: acpi_array_size.patch --]
[-- Type: text/x-patch, Size: 1259 bytes --]


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 <linux/proc_fs.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/moduleparam.h>
 #include <asm/uaccess.h>
 #include <acpi/acpi_drivers.h>
@@ -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,

Re: [PATCH] debug.c: don't invent NUM_OF

[Len Brown]

applied.

thanks,
-len

On Fri, 2005-01-07 at 12:14, Randy.Dunlap wrote:
> 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 <rddunlap-3NddpPZAyC0@public.gmane.org>
> 
> diffstat:=
>   drivers/acpi/debug.c |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
> 
> ---
> 
> 
> 
> 
> ______________________________________________________________________
> 
> 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 <linux/proc_fs.h>
>  #include <linux/init.h>
> +#include <linux/kernel.h>
>  #include <linux/moduleparam.h>
>  #include <asm/uaccess.h>
>  #include <acpi/acpi_drivers.h>
> @@ -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,



-------------------------------------------------------
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