aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/isci/init.c')
-rw-r--r--drivers/scsi/isci/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index 68ca1a4f30af..8d9a8bfff4d5 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -484,7 +484,7 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic
484 orom = isci_request_oprom(pdev); 484 orom = isci_request_oprom(pdev);
485 485
486 for (i = 0; orom && i < ARRAY_SIZE(orom->ctrl); i++) { 486 for (i = 0; orom && i < ARRAY_SIZE(orom->ctrl); i++) {
487 if (scic_oem_parameters_validate(&orom->ctrl[i])) { 487 if (sci_oem_parameters_validate(&orom->ctrl[i])) {
488 dev_warn(&pdev->dev, 488 dev_warn(&pdev->dev,
489 "[%d]: invalid oem parameters detected, falling back to firmware\n", i); 489 "[%d]: invalid oem parameters detected, falling back to firmware\n", i);
490 devm_kfree(&pdev->dev, orom); 490 devm_kfree(&pdev->dev, orom);
@@ -554,7 +554,7 @@ static void __devexit isci_pci_remove(struct pci_dev *pdev)
554 for_each_isci_host(i, ihost, pdev) { 554 for_each_isci_host(i, ihost, pdev) {
555 isci_unregister(ihost); 555 isci_unregister(ihost);
556 isci_host_deinit(ihost); 556 isci_host_deinit(ihost);
557 scic_controller_disable_interrupts(ihost); 557 sci_controller_disable_interrupts(ihost);
558 } 558 }
559} 559}
560 560