[SCSI] Improve inquiry printing

 - Replace scsi_device_types array API with scsi_device_type function API.
   Gets rid of a lot of common code, as well as being easier to use.
 - Add the new device types in SPC4 r05a, and rename some of the older ones.
 - Reformat the printing of inquiry data; now fits on one line and
   includes PQ.

I think I've addressed all the feedback from the previous versions.  My
current test box prints:

scsi 2:0:1:0: Direct access     HP 18.2G ATLAS10K3_18_SCA HP05 PQ: 0 ANSI: 2

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c
index 7f891023aa15..c4e16c0775de 100644
--- a/drivers/scsi/fcal.c
+++ b/drivers/scsi/fcal.c
@@ -248,8 +248,7 @@ int fcal_proc_info (struct Scsi_Host *host, char *buffer, char **start, off_t of
                                 if (scd->id == target) {
                                         SPRINTF ("  [AL-PA: %02x, Id: %02d, Port WWN: %08x%08x, Node WWN: %08x%08x]  ",
                                                 alpa, target, u1[0], u1[1], u2[0], u2[1]);
-                                        SPRINTF ("%s ", (scd->type < MAX_SCSI_DEVICE_CODE) ?
-                                                scsi_device_types[(short) scd->type] : "Unknown device");
+                                        SPRINTF ("%s ", scsi_device_type(scd->type));
 
                                         for (j = 0; (j < 8) && (scd->vendor[j] >= 0x20); j++)
                                                 SPRINTF ("%c", scd->vendor[j]);