diff options
author | Bartosz Barcinski <Bartosz.Barcinski@intel.com> | 2011-04-12 20:28:43 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 07:00:37 -0400 |
commit | 6cb4d6b382be6345c2d0c4b1b90dfdf9af32da7e (patch) | |
tree | 9d9849a1557888051429a36d4ffa2cbd2dd3591e /drivers/scsi/isci/init.c | |
parent | 467e855a0331f619f41fbf7391bc29ec0ca923a0 (diff) |
isci: audit usage of BUG_ON macro in isci driver
Removes unnecessary usage of BUG_ON macro, excluding core directory.
In some cases macro is unnecesary, check is done in caller function.
In other cases macro is replaced by if construction with
appropriate warning.
Signed-off-by: Maciej Patelczyk <maciej.patelczyk@intel.com>
[changed some survivable bug conditions to WARN_ONCE]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/init.c')
-rw-r--r-- | drivers/scsi/isci/init.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 5e63ae6a75d1..5da9a6925cd7 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c | |||
@@ -362,8 +362,6 @@ static int isci_setup_interrupts(struct pci_dev *pdev) | |||
362 | else | 362 | else |
363 | isr = isci_msix_isr; | 363 | isr = isci_msix_isr; |
364 | 364 | ||
365 | BUG_ON(!isci_host); | ||
366 | |||
367 | err = devm_request_irq(&pdev->dev, msix->vector, isr, 0, | 365 | err = devm_request_irq(&pdev->dev, msix->vector, isr, 0, |
368 | DRV_NAME"-msix", isci_host); | 366 | DRV_NAME"-msix", isci_host); |
369 | if (!err) | 367 | if (!err) |
@@ -379,13 +377,11 @@ static int isci_setup_interrupts(struct pci_dev *pdev) | |||
379 | pci_disable_msix(pdev); | 377 | pci_disable_msix(pdev); |
380 | goto intx; | 378 | goto intx; |
381 | } | 379 | } |
382 | |||
383 | return 0; | 380 | return 0; |
384 | 381 | ||
385 | intx: | 382 | intx: |
386 | err = devm_request_irq(&pdev->dev, pdev->irq, isci_intx_isr, | 383 | err = devm_request_irq(&pdev->dev, pdev->irq, isci_intx_isr, |
387 | IRQF_SHARED, DRV_NAME"-intx", pdev); | 384 | IRQF_SHARED, DRV_NAME"-intx", pdev); |
388 | |||
389 | return err; | 385 | return err; |
390 | } | 386 | } |
391 | 387 | ||