From 0b9d22dc579385798d600ccbee022380364f0698 Mon Sep 17 00:00:00 2001 From: Himangi Saraogi Date: Tue, 17 Jun 2014 01:40:04 +0530 Subject: [PATCH 1/2] zorro: Use ARRAY_SIZE ARRAY_SIZE is more concise to use when the size of an array is divided by the size of its type or the size of its first element. The Coccinelle semantic patch that makes this change is as follows: // @@ type T; T[] E; @@ - (sizeof(E)/sizeof(T)) + ARRAY_SIZE(E) // Signed-off-by: Himangi Saraogi [Geert: Also convert the MANUF definition] Signed-off-by: Geert Uytterhoeven --- drivers/zorro/names.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/zorro/names.c b/drivers/zorro/names.c index 6f3fd9903ac3..83eedddbb794 100644 --- a/drivers/zorro/names.c +++ b/drivers/zorro/names.c @@ -46,13 +46,13 @@ struct zorro_manuf_info { #include "devlist.h" static struct zorro_manuf_info __initdata zorro_manuf_list[] = { -#define MANUF( manuf, name ) { 0x##manuf, sizeof(__prods_##manuf) / sizeof(struct zorro_prod_info), __manufstr_##manuf, __prods_##manuf }, +#define MANUF( manuf, name ) { 0x##manuf, ARRAY_SIZE(__prods_##manuf), __manufstr_##manuf, __prods_##manuf }, #define ENDMANUF() #define PRODUCT( manuf, prod, name ) #include "devlist.h" }; -#define MANUFS (sizeof(zorro_manuf_list)/sizeof(struct zorro_manuf_info)) +#define MANUFS ARRAY_SIZE(zorro_manuf_list) void __init zorro_name_device(struct zorro_dev *dev) { From 9117710a5997eb078035052800a31b77d47e0e5a Mon Sep 17 00:00:00 2001 From: Nicholas Krause Date: Fri, 4 Jul 2014 12:29:53 -0400 Subject: [PATCH 2/2] m68k/sun3: Remove define statement no longer needed In the file sun3_pgalloc.h we should remove #define_KERNPG_TABLE equals 0 as this define statement hasn't been used since kernel verison 2.5.18 and is now no longer needed. Signed-off-by: Nicholas Krause Signed-off-by: Geert Uytterhoeven --- arch/m68k/include/asm/sun3_pgalloc.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h index f868506e3350..0931388de47f 100644 --- a/arch/m68k/include/asm/sun3_pgalloc.h +++ b/arch/m68k/include/asm/sun3_pgalloc.h @@ -12,10 +12,6 @@ #include -/* FIXME - when we get this compiling */ -/* erm, now that it's compiling, what do we do with it? */ -#define _KERNPG_TABLE 0 - extern const char bad_pmd_string[]; #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); })