Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-drm-fsl-dcu.git] / drivers / scsi / fcal.c

diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c
index a6f120dcdfc37ae8e5c452d45d6065ff40b9f01d..c4e16c0775def31770e99bead26f0f310e612694 100644 (file)
--- a/drivers/scsi/fcal.c
+++ b/drivers/scsi/fcal.c
@@ -13,7 +13,6 @@
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
 #endif
@@ -70,7 +69,7 @@ static unsigned char target2alpa[] = {
 
 static int fcal_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cmnd *fcmd);
 
-int fcal_slave_configure(Scsi_Device *device)
+int fcal_slave_configure(struct scsi_device *device)
 {
        int depth_to_use;
        
@@ -89,7 +88,7 @@ int fcal_slave_configure(Scsi_Device *device)
 
 /* Detect all FC Arbitrated Loops attached to the machine.
    fc4 module has done all the work for us... */
-int __init fcal_detect(Scsi_Host_Template *tpnt)
+int __init fcal_detect(struct scsi_host_template *tpnt)
 {
        int nfcals = 0;
        fc_channel *fc;
@@ -244,13 +243,12 @@ int fcal_proc_info (struct Scsi_Host *host, char *buffer, char **start, off_t of
                        SPRINTF ("  [AL-PA: %02x, Port WWN: %08x%08x, Node WWN: %08x%08x] Not responded to PRLI\n",
                                 alpa, u1[0], u1[1], u2[0], u2[1]);
                } else {
-                       Scsi_Device *scd;
+                       struct scsi_device *scd;
                        shost_for_each_device(scd, host)
                                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]);
@@ -297,7 +295,7 @@ static int fcal_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cmn
        return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
        .name                   = "Fibre Channel Arbitrated Loop",
        .detect                 = fcal_detect,
        .release                = fcal_release,