openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ide-cd: replace C code with call to ARRAY_SIZE() macro 

Delete the unnecessary macro ARY_LEN and use ARRAY_SIZE directly.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Robert P. J. Day 2007-07-09 23:17:57 +02:00 committed by Bartlomiej Zolnierkiewicz
parent f3577db0c2
commit 74c8f97a6c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ide/ide-cd.c
View File

@ -481,7 +481,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
else else
printk(" Unknown Error Type: "); printk(" Unknown Error Type: ");
if (sense->sense_key < ARY_LEN(sense_key_texts)) if (sense->sense_key < ARRAY_SIZE(sense_key_texts))
s = sense_key_texts[sense->sense_key]; s = sense_key_texts[sense->sense_key];
printk("%s -- (Sense key=0x%02x)\n", s, sense->sense_key); printk("%s -- (Sense key=0x%02x)\n", s, sense->sense_key);
@ -491,7 +491,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
sense->ascq); sense->ascq);
s = buf; s = buf;
} else { } else {
int lo = 0, mid, hi = ARY_LEN(sense_data_texts); int lo = 0, mid, hi = ARRAY_SIZE(sense_data_texts);
unsigned long key = (sense->sense_key << 16); unsigned long key = (sense->sense_key << 16);
key |= (sense->asc << 8); key |= (sense->asc << 8);
if (!(sense->ascq >= 0x80 && sense->ascq <= 0xdd)) if (!(sense->ascq >= 0x80 && sense->ascq <= 0xdd))
@ -524,7 +524,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
if (failed_command != NULL) { if (failed_command != NULL) {
int lo=0, mid, hi= ARY_LEN (packet_command_texts); int lo=0, mid, hi= ARRAY_SIZE(packet_command_texts);
s = NULL; s = NULL;
while (hi > lo) { while (hi > lo) {

2
drivers/ide/ide-cd.h
View File

@ -498,8 +498,6 @@ struct cdrom_info {
* Descriptions of ATAPI error codes. * Descriptions of ATAPI error codes.
*/ */
#define ARY_LEN(a) ((sizeof(a) / sizeof(a[0])))
/* This stuff should be in cdrom.h, since it is now generic... */ /* This stuff should be in cdrom.h, since it is now generic... */
/* ATAPI sense keys (from table 140 of ATAPI 2.6) */ /* ATAPI sense keys (from table 140 of ATAPI 2.6) */