diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2005-12-15 16:22:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-12-15 18:42:18 -0800 |
| commit | b32aaffcdc694650d299a59501c5b3e267fca343 (patch) | |
| tree | 322a00bae954da76a790cad17807bc0f12bc1b6c /drivers/scsi/scsi_transport_spi.c | |
| parent | 479721538957d514df6dcb29f66e5edd26393bb1 (diff) | |
| download | op-kernel-dev-b32aaffcdc694650d299a59501c5b3e267fca343.zip op-kernel-dev-b32aaffcdc694650d299a59501c5b3e267fca343.tar.gz | |
[SCSI] Use ARRAY_SIZE in spi_print_msg
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>
Diffstat (limited to 'drivers/scsi/scsi_transport_spi.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_spi.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index 8cc5dff..380e167 100644 --- a/drivers/scsi/scsi_transport_spi.c +++ b/drivers/scsi/scsi_transport_spi.c @@ -1057,19 +1057,16 @@ static const char * const one_byte_msgs[] = { /* 0x0c */ "Bus device reset", "Abort Tag", "Clear Queue", /* 0x0f */ "Initiate Recovery", "Release Recovery" }; -#define NO_ONE_BYTE_MSGS (sizeof(one_byte_msgs) / sizeof (const char *)) static const char * const two_byte_msgs[] = { /* 0x20 */ "Simple Queue Tag", "Head of Queue Tag", "Ordered Queue Tag", /* 0x23 */ "Ignore Wide Residue" }; -#define NO_TWO_BYTE_MSGS (sizeof(two_byte_msgs) / sizeof (const char *)) static const char * const extended_msgs[] = { /* 0x00 */ "Modify Data Pointer", "Synchronous 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) @@ -1077,7 +1074,7 @@ int spi_print_msg(const unsigned char *msg) int len = 0, i; if (msg[0] == EXTENDED_MESSAGE) { len = 3 + msg[1]; - if (msg[2] < NO_EXTENDED_MSGS) + if (msg[2] < ARRAY_SIZE(extended_msgs)) printk ("%s ", extended_msgs[msg[2]]); else printk ("Extended Message, reserved code (0x%02x) ", @@ -1107,14 +1104,14 @@ int spi_print_msg(const unsigned char *msg) len = 1; /* Normal One byte */ } 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]]); else printk("reserved (%02x) ", msg[0]); len = 1; /* Two byte */ } 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], msg[1]); else |
