Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SCSI] Use ARRAY_SIZE in spi_print_msg

Browse Source 
Replace the custom NO_*_MSGS definitions with uses of ARRAY_SIZE.
This fixes a bug in the definition of NO_EXTENDED_MSGS.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Matthew Wilcox 2005-12-15 16:22:01 -05:00 committed by James Bottomley
parent 4797215389
commit b32aaffcdc
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/scsi_transport_spi.c
View File

@ -1057,19 +1057,16 @@ static const char * const one_byte_msgs[] = {
/* 0x0c */ "Bus device reset", "Abort Tag", "Clear Queue", /* 0x0c */ "Bus device reset", "Abort Tag", "Clear Queue",
/* 0x0f */ "Initiate Recovery", "Release Recovery" /* 0x0f */ "Initiate Recovery", "Release Recovery"
}; };
#define NO_ONE_BYTE_MSGS (sizeof(one_byte_msgs) / sizeof (const char *))
static const char * const two_byte_msgs[] = { static const char * const two_byte_msgs[] = {
/* 0x20 */ "Simple Queue Tag", "Head of Queue Tag", "Ordered Queue Tag", /* 0x20 */ "Simple Queue Tag", "Head of Queue Tag", "Ordered Queue Tag",
/* 0x23 */ "Ignore Wide Residue" /* 0x23 */ "Ignore Wide Residue"
}; };
#define NO_TWO_BYTE_MSGS (sizeof(two_byte_msgs) / sizeof (const char *))
static const char * const extended_msgs[] = { static const char * const extended_msgs[] = {
/* 0x00 */ "Modify Data Pointer", "Synchronous Data Transfer Request", /* 0x00 */ "Modify Data Pointer", "Synchronous Data Transfer Request",
/* 0x02 */ "SCSI-I Extended Identify", "Wide Data Transfer Request" /* 0x02 */ "SCSI-I Extended Identify", "Wide Data Transfer Request"
}; };
#define NO_EXTENDED_MSGS (sizeof(two_byte_msgs) / sizeof (const char *))
int spi_print_msg(const unsigned char *msg) int spi_print_msg(const unsigned char *msg)
@ -1077,7 +1074,7 @@ int spi_print_msg(const unsigned char *msg)
int len = 0, i; int len = 0, i;
if (msg[0] == EXTENDED_MESSAGE) { if (msg[0] == EXTENDED_MESSAGE) {
len = 3 + msg[1]; len = 3 + msg[1];
if (msg[2] < NO_EXTENDED_MSGS) if (msg[2] < ARRAY_SIZE(extended_msgs))
printk ("%s ", extended_msgs[msg[2]]); printk ("%s ", extended_msgs[msg[2]]);
else else
printk ("Extended Message, reserved code (0x%02x) ", printk ("Extended Message, reserved code (0x%02x) ",
@ -1107,14 +1104,14 @@ int spi_print_msg(const unsigned char *msg)
len = 1; len = 1;
/* Normal One byte */ /* Normal One byte */
} else if (msg[0] < 0x1f) { } else if (msg[0] < 0x1f) {
if (msg[0] < NO_ONE_BYTE_MSGS) if (msg[0] < ARRAY_SIZE(one_byte_msgs))
printk(one_byte_msgs[msg[0]]); printk(one_byte_msgs[msg[0]]);
else else
printk("reserved (%02x) ", msg[0]); printk("reserved (%02x) ", msg[0]);
len = 1; len = 1;
/* Two byte */ /* Two byte */
} else if (msg[0] <= 0x2f) { } else if (msg[0] <= 0x2f) {
if ((msg[0] - 0x20) < NO_TWO_BYTE_MSGS) if ((msg[0] - 0x20) < ARRAY_SIZE(two_byte_msgs))
printk("%s %02x ", two_byte_msgs[msg[0] - 0x20], printk("%s %02x ", two_byte_msgs[msg[0] - 0x20],
msg[1]); msg[1]);
else else