drivers/block: Use ARRAY_SIZE macro
Subsystems (3)
PATCH 1/1 drivers/block: Use ARRAY_SIZE macro
Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove a duplicate of ARRAY_SIZE. Some trailing whitespaces are also removed.
drivers/block/acsi* has been left out as it's marked BROKEN.
---
drivers/block/DAC960.c | 2 +- drivers/block/amiflop.c | 2 +- drivers/block/ataflop.c | 2 +- drivers/block/cciss.c | 4 ++-- drivers/block/cpqarray.c | 4 ++-- drivers/block/floppy.c | 9 ++++----- drivers/block/xd.c | 6 +++--- 7 files changed, 14 insertions(+), 15 deletions(-)
drivers/block/amiflop.c +1 -1
@@ -131,7 +131,7 @@ static struct fd_drive_type drive_types[ { FD_DD_5, "DD 5.25", 40, 2, 14716, 13630, 1, 40, 81, 6, 30, 2}, { FD_NODRIVE, "No Drive", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; -static int num_dr_types =sizeof (drive_types) /sizeof (drive_types[0 ]); +static int num_dr_types =ARRAY_SIZE (drive_types);static int amiga_read (int ),dos_read (int );static void amiga_write (int ),dos_write (int );
drivers/block/ataflop.c +1 -1
@@ -181,7 +181,7 @@ static struct { { 6, TYPE_HD }, /* 31: H1640 <- was H1600 == h1600 for PC */ }; -#define NUM_DISK_MINORS (sizeof(minor2disktype)/sizeof(*minor2disktype)) +#define NUM_DISK_MINORS ARRAY_SIZE(minor2disktype)/* * Maximum disk size (in kilobytes). This default is used whenever the
drivers/block/cciss.c +2 -2
@@ -103,7 +103,7 @@ static const struct pci_device_id cciss_ };MODULE_DEVICE_TABLE (pci, cciss_pci_device_id); -#define NR_PRODUCTS (sizeof(products)/sizeof(struct board_type)) +#define NR_PRODUCTS ARRAY_SIZE(products)/* board_id = Subsystem Device ID & Vendor ID * product = Marketing Name for the board
@@ -2775,7 +2775,7 @@ static int cciss_pci_init(ctlr_info_t *c c->board_id = board_id;#ifdef CCISS_DEBUG -print_cfg_table (c->cfgtable); +print_cfg_table (c->cfgtable);#endif /* CCISS_DEBUG */ for (i=0 ; i<NR_PRODUCTS ; i++) {
drivers/block/cpqarray.c +2 -2
@@ -72,11 +72,11 @@ static ctlr_info_t *hba[MAX_CTLR];static int eisa[8 ]; -#define NR_PRODUCTS (sizeof(products)/sizeof(struct board_type)) +#define NR_PRODUCTS ARRAY_SIZE(products)/* board_id = Subsystem Device ID & Vendor ID * product = Marketing Name for the board -* access = Address of the struct of function pointers +* access = Address of the struct of function pointers */ static struct board_type products[] = { {0x0040110E ,"IDA" , &smart1_access },
drivers/block/DAC960.c +1 -1
@@ -3767,7 +3767,7 @@ static void DAC960_V1_ProcessCompletedCoif (SenseKey == DAC960_SenseKey_VendorSpecific && AdditionalSenseCode ==0x80 && AdditionalSenseCodeQualifier < -sizeof (DAC960_EventMessages) /sizeof (char *)) +ARRAY_SIZE (DAC960_EventMessages)) DAC960_Critical("Physical Device %d:%d %s\n", Controller, EventLogEntry->Channel, EventLogEntry->TargetID,
drivers/block/floppy.c +4 -5
@@ -479,7 +479,6 @@ static struct floppy_struct floppy_type[ { 3200,20,2,80,0,0x1C,0x00,0xCF,0x2C,"H1600" }, /* 31 1.6MB 3.5" */ }; -#define NUMBER (x) (sizeof(x) / sizeof(*(x)))#define SECTSIZE (_FD_SECTSIZE(*floppy))/* Auto-detection: Disk type used until the next media change occurs. */
@@ -3645,7 +3644,7 @@ static void __init config_types(void)const char *name =NULL ;static char temparea[32 ]; -if (type <NUMBER (default_drive_params)) { +if (type <ARRAY_SIZE (default_drive_params)) { params = &default_drive_params[type].params;if (type) { name = default_drive_params[type].name;
@@ -3960,7 +3959,7 @@ static void __init register_devfs_entrie {int base_minor = (drive <4 ) ? drive : (124 + drive); -if (UDP ->cmos <NUMBER (default_drive_params)) { +if (UDP ->cmos <ARRAY_SIZE (default_drive_params)) {int i =0 ; do { int minor = base_minor + (table_sup[UDP->cmos][i] << 2);
@@ -4218,7 +4217,7 @@ static struct kobject *floppy_find(dev_t !(allowed_drive_mask & (1 << drive)) || fdc_state[FDC(drive)].version == FDC_NONE)return NULL ; -if (((*part >>2 ) &0x1f ) >=NUMBER (floppy_type)) +if (((*part >>2 ) &0x1f ) >=ARRAY_SIZE (floppy_type))return NULL ; *part =0 ;return get_disk (disks[drive]);
@@ -4570,7 +4569,7 @@ static void unregister_devfs_entries(int { int i; - if (UDP->cmos < NUMBER(default_drive_params)) { + if (UDP->cmos < ARRAY_SIZE(default_drive_params)) { i = 0; do { devfs_remove("floppy/%d%s", drive,
drivers/block/xd.c +3 -3
@@ -276,11 +276,11 @@ static u_char __init xd_detect (u_char *return (1 ); } -for (i =0 ; i < (sizeof (xd_bases) /sizeof (xd_bases[0 ])); i++) { +for (i =0 ; i <ARRAY_SIZE (xd_bases); i++) {void __iomem *p =ioremap (xd_bases[i],0x2000 );if (!p)continue ; -for (j =1 ; j < (sizeof (xd_sigs) /sizeof (xd_sigs[0 ])); j++) { +for (j =1 ; j <ARRAY_SIZE (xd_sigs); j++) {const char *s = xd_sigs[j].string;if (check_signature (p + xd_sigs[j].offset, s,strlen (s))) { *controller = j;
@@ -1017,7 +1017,7 @@ static void __init do_xd_setup (int *intcase 2 :if ((integers[2 ] >0 ) && (integers[2 ] <16 )) xd_irq = integers[2 ];case 1 : xd_override =1 ; -if ((integers[1 ] >=0 ) && (integers[1 ] < (sizeof (xd_sigs) /sizeof (xd_sigs[0 ])))) +if ((integers[1 ] >=0 ) && (integers[1 ] <ARRAY_SIZE (xd_sigs))) xd_type = integers[1 ];case 0 :break ;default :printk ("xd: too many parameters for xd\n" );
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 5 lines · Tobias Klauser
Use
ARRAY_SIZEmacro instead of sizeof(x)/sizeof(x[0]) and remove a duplicate ofARRAY_SIZE. Some trailing whitespaces are also removed.
drivers/block/acsi*has been left out as it's marked BROKEN.
And if noone ever improves on it it'll probably stay BROKEN. Might as well fix it up now that you've done the other files :)
The patch looked good to me btw.
--
Jesper Juhl <[email protected]>
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please http://www.expita.com/nomime.html
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors