diff options
Diffstat (limited to 'drivers/message/fusion/mptbase.c')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 4262a22adc22..537836068c49 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -313,13 +313,13 @@ mpt_reply(MPT_ADAPTER *ioc, u32 pa) | |||
313 | u32 log_info = le32_to_cpu(mr->u.reply.IOCLogInfo); | 313 | u32 log_info = le32_to_cpu(mr->u.reply.IOCLogInfo); |
314 | if (ioc->bus_type == FC) | 314 | if (ioc->bus_type == FC) |
315 | mpt_fc_log_info(ioc, log_info); | 315 | mpt_fc_log_info(ioc, log_info); |
316 | else if (ioc->bus_type == SCSI) | 316 | else if (ioc->bus_type == SPI) |
317 | mpt_sp_log_info(ioc, log_info); | 317 | mpt_sp_log_info(ioc, log_info); |
318 | else if (ioc->bus_type == SAS) | 318 | else if (ioc->bus_type == SAS) |
319 | mpt_sas_log_info(ioc, log_info); | 319 | mpt_sas_log_info(ioc, log_info); |
320 | } | 320 | } |
321 | if (ioc_stat & MPI_IOCSTATUS_MASK) { | 321 | if (ioc_stat & MPI_IOCSTATUS_MASK) { |
322 | if (ioc->bus_type == SCSI && | 322 | if (ioc->bus_type == SPI && |
323 | cb_idx != mpt_stm_index && | 323 | cb_idx != mpt_stm_index && |
324 | cb_idx != mpt_lan_index) | 324 | cb_idx != mpt_lan_index) |
325 | mpt_sp_ioc_info(ioc, (u32)ioc_stat, mf); | 325 | mpt_sp_ioc_info(ioc, (u32)ioc_stat, mf); |
@@ -1376,7 +1376,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1376 | } | 1376 | } |
1377 | else if (pdev->device == MPI_MANUFACTPAGE_DEVID_53C1030) { | 1377 | else if (pdev->device == MPI_MANUFACTPAGE_DEVID_53C1030) { |
1378 | ioc->prod_name = "LSI53C1030"; | 1378 | ioc->prod_name = "LSI53C1030"; |
1379 | ioc->bus_type = SCSI; | 1379 | ioc->bus_type = SPI; |
1380 | /* 1030 Chip Fix. Disable Split transactions | 1380 | /* 1030 Chip Fix. Disable Split transactions |
1381 | * for PCIX. Set MOST bits to zero if Rev < C0( = 8). | 1381 | * for PCIX. Set MOST bits to zero if Rev < C0( = 8). |
1382 | */ | 1382 | */ |
@@ -1389,7 +1389,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1389 | } | 1389 | } |
1390 | else if (pdev->device == MPI_MANUFACTPAGE_DEVID_1030_53C1035) { | 1390 | else if (pdev->device == MPI_MANUFACTPAGE_DEVID_1030_53C1035) { |
1391 | ioc->prod_name = "LSI53C1035"; | 1391 | ioc->prod_name = "LSI53C1035"; |
1392 | ioc->bus_type = SCSI; | 1392 | ioc->bus_type = SPI; |
1393 | } | 1393 | } |
1394 | else if (pdev->device == MPI_MANUFACTPAGE_DEVID_SAS1064) { | 1394 | else if (pdev->device == MPI_MANUFACTPAGE_DEVID_SAS1064) { |
1395 | ioc->prod_name = "LSISAS1064"; | 1395 | ioc->prod_name = "LSISAS1064"; |
@@ -3042,7 +3042,7 @@ mpt_downloadboot(MPT_ADAPTER *ioc, MpiFwHeader_t *pFwHeader, int sleepFlag) | |||
3042 | /* Clear the internal flash bad bit - autoincrementing register, | 3042 | /* Clear the internal flash bad bit - autoincrementing register, |
3043 | * so must do two writes. | 3043 | * so must do two writes. |
3044 | */ | 3044 | */ |
3045 | if (ioc->bus_type == SCSI) { | 3045 | if (ioc->bus_type == SPI) { |
3046 | /* | 3046 | /* |
3047 | * 1030 and 1035 H/W errata, workaround to access | 3047 | * 1030 and 1035 H/W errata, workaround to access |
3048 | * the ClearFlashBadSignatureBit | 3048 | * the ClearFlashBadSignatureBit |
@@ -3152,7 +3152,7 @@ KickStart(MPT_ADAPTER *ioc, int force, int sleepFlag) | |||
3152 | int cnt,cntdn; | 3152 | int cnt,cntdn; |
3153 | 3153 | ||
3154 | dinitprintk((KERN_WARNING MYNAM ": KickStarting %s!\n", ioc->name)); | 3154 | dinitprintk((KERN_WARNING MYNAM ": KickStarting %s!\n", ioc->name)); |
3155 | if (ioc->bus_type == SCSI) { | 3155 | if (ioc->bus_type == SPI) { |
3156 | /* Always issue a Msg Unit Reset first. This will clear some | 3156 | /* Always issue a Msg Unit Reset first. This will clear some |
3157 | * SCSI bus hang conditions. | 3157 | * SCSI bus hang conditions. |
3158 | */ | 3158 | */ |
@@ -3580,7 +3580,7 @@ initChainBuffers(MPT_ADAPTER *ioc) | |||
3580 | dinitprintk((KERN_INFO MYNAM ": %s Now numSGE=%d num_sge=%d num_chain=%d\n", | 3580 | dinitprintk((KERN_INFO MYNAM ": %s Now numSGE=%d num_sge=%d num_chain=%d\n", |
3581 | ioc->name, numSGE, num_sge, num_chain)); | 3581 | ioc->name, numSGE, num_sge, num_chain)); |
3582 | 3582 | ||
3583 | if (ioc->bus_type == SCSI) | 3583 | if (ioc->bus_type == SPI) |
3584 | num_chain *= MPT_SCSI_CAN_QUEUE; | 3584 | num_chain *= MPT_SCSI_CAN_QUEUE; |
3585 | else | 3585 | else |
3586 | num_chain *= MPT_FC_CAN_QUEUE; | 3586 | num_chain *= MPT_FC_CAN_QUEUE; |