diff options
author | Robert P. J. Day <rpjday@mindspring.com> | 2007-07-09 17:17:57 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-09 17:17:57 -0400 |
commit | 74c8f97a6c2d12fb144ad34076e969e8a01dc4b3 (patch) | |
tree | fcdb19a6ce5fc5a8bd229c85a83fc41f96e86637 | |
parent | f3577db0c294ab4ce8460a8003312474b509e95f (diff) |
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>
-rw-r--r-- | drivers/ide/ide-cd.c | 6 | ||||
-rw-r--r-- | drivers/ide/ide-cd.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 252ab8295edf..1486eb212ccc 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -481,7 +481,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive, | |||
481 | else | 481 | else |
482 | printk(" Unknown Error Type: "); | 482 | printk(" Unknown Error Type: "); |
483 | 483 | ||
484 | if (sense->sense_key < ARY_LEN(sense_key_texts)) | 484 | if (sense->sense_key < ARRAY_SIZE(sense_key_texts)) |
485 | s = sense_key_texts[sense->sense_key]; | 485 | s = sense_key_texts[sense->sense_key]; |
486 | 486 | ||
487 | printk("%s -- (Sense key=0x%02x)\n", s, sense->sense_key); | 487 | printk("%s -- (Sense key=0x%02x)\n", s, sense->sense_key); |
@@ -491,7 +491,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive, | |||
491 | sense->ascq); | 491 | sense->ascq); |
492 | s = buf; | 492 | s = buf; |
493 | } else { | 493 | } else { |
494 | int lo = 0, mid, hi = ARY_LEN(sense_data_texts); | 494 | int lo = 0, mid, hi = ARRAY_SIZE(sense_data_texts); |
495 | unsigned long key = (sense->sense_key << 16); | 495 | unsigned long key = (sense->sense_key << 16); |
496 | key |= (sense->asc << 8); | 496 | key |= (sense->asc << 8); |
497 | if (!(sense->ascq >= 0x80 && sense->ascq <= 0xdd)) | 497 | if (!(sense->ascq >= 0x80 && sense->ascq <= 0xdd)) |
@@ -524,7 +524,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive, | |||
524 | 524 | ||
525 | if (failed_command != NULL) { | 525 | if (failed_command != NULL) { |
526 | 526 | ||
527 | int lo=0, mid, hi= ARY_LEN (packet_command_texts); | 527 | int lo=0, mid, hi= ARRAY_SIZE(packet_command_texts); |
528 | s = NULL; | 528 | s = NULL; |
529 | 529 | ||
530 | while (hi > lo) { | 530 | while (hi > lo) { |
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index ad1f2ed14a37..228b29c5d2e4 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h | |||
@@ -498,8 +498,6 @@ struct cdrom_info { | |||
498 | * Descriptions of ATAPI error codes. | 498 | * Descriptions of ATAPI error codes. |
499 | */ | 499 | */ |
500 | 500 | ||
501 | #define ARY_LEN(a) ((sizeof(a) / sizeof(a[0]))) | ||
502 | |||
503 | /* This stuff should be in cdrom.h, since it is now generic... */ | 501 | /* This stuff should be in cdrom.h, since it is now generic... */ |
504 | 502 | ||
505 | /* ATAPI sense keys (from table 140 of ATAPI 2.6) */ | 503 | /* ATAPI sense keys (from table 140 of ATAPI 2.6) */ |