Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74c8f97a authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Bartlomiej Zolnierkiewicz
Browse files

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: default avatarRobert P. J. Day <rpjday@mindspring.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent f3577db0

drivers/ide/ide-cd.c

+3 −3
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive, 
		else

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



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

			s = buf;

		} 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);

			key |= (sense->asc << 8);

			if (!(sense->ascq >= 0x80 && sense->ascq <= 0xdd))
@@ -524,7 +524,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive, 


		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;



			while (hi > lo) {

drivers/ide/ide-cd.h

+0 −2
Original line number Diff line number Diff line
@@ -498,8 +498,6 @@ struct cdrom_info { 
 * 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... */



/* ATAPI sense keys (from table 140 of ATAPI 2.6) */