diff options
Diffstat (limited to 'drivers/scsi/isci/init.c')
-rw-r--r-- | drivers/scsi/isci/init.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 8d9a8bfff4d5..61e0d09e2b57 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c | |||
@@ -85,10 +85,6 @@ MODULE_DEVICE_TABLE(pci, isci_id_table); | |||
85 | 85 | ||
86 | /* linux isci specific settings */ | 86 | /* linux isci specific settings */ |
87 | 87 | ||
88 | int isci_si_rev = ISCI_SI_REVA2; | ||
89 | module_param(isci_si_rev, int, 0); | ||
90 | MODULE_PARM_DESC(isci_si_rev, "(deprecated) override default si rev (0: A0 1: A2 2: B0)"); | ||
91 | |||
92 | unsigned char no_outbound_task_to = 20; | 88 | unsigned char no_outbound_task_to = 20; |
93 | module_param(no_outbound_task_to, byte, 0); | 89 | module_param(no_outbound_task_to, byte, 0); |
94 | MODULE_PARM_DESC(no_outbound_task_to, "No Outbound Task Timeout (1us incr)"); | 90 | MODULE_PARM_DESC(no_outbound_task_to, "No Outbound Task Timeout (1us incr)"); |
@@ -435,32 +431,6 @@ static struct isci_host *isci_host_alloc(struct pci_dev *pdev, int id) | |||
435 | return NULL; | 431 | return NULL; |
436 | } | 432 | } |
437 | 433 | ||
438 | static void check_si_rev(struct pci_dev *pdev) | ||
439 | { | ||
440 | switch (pdev->revision) { | ||
441 | case 0: | ||
442 | case 1: | ||
443 | /* if the id is ambiguous don't update isci_si_rev */ | ||
444 | break; | ||
445 | case 3: | ||
446 | isci_si_rev = ISCI_SI_REVA2; | ||
447 | break; | ||
448 | case 4: | ||
449 | isci_si_rev = ISCI_SI_REVB0; | ||
450 | break; | ||
451 | default: | ||
452 | case 5: | ||
453 | isci_si_rev = ISCI_SI_REVC0; | ||
454 | break; | ||
455 | } | ||
456 | |||
457 | dev_info(&pdev->dev, "driver configured for %s silicon (rev: %d)\n", | ||
458 | isci_si_rev == ISCI_SI_REVA0 ? "A0" : | ||
459 | isci_si_rev == ISCI_SI_REVA2 ? "A2" : | ||
460 | isci_si_rev == ISCI_SI_REVB0 ? "B0" : "C0", pdev->revision); | ||
461 | |||
462 | } | ||
463 | |||
464 | static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) | 434 | static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) |
465 | { | 435 | { |
466 | struct isci_pci_info *pci_info; | 436 | struct isci_pci_info *pci_info; |
@@ -470,7 +440,8 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic | |||
470 | struct isci_orom *orom = NULL; | 440 | struct isci_orom *orom = NULL; |
471 | char *source = "(platform)"; | 441 | char *source = "(platform)"; |
472 | 442 | ||
473 | check_si_rev(pdev); | 443 | dev_info(&pdev->dev, "driver configured for rev: %d silicon\n", |
444 | pdev->revision); | ||
474 | 445 | ||
475 | pci_info = devm_kzalloc(&pdev->dev, sizeof(*pci_info), GFP_KERNEL); | 446 | pci_info = devm_kzalloc(&pdev->dev, sizeof(*pci_info), GFP_KERNEL); |
476 | if (!pci_info) | 447 | if (!pci_info) |