diff options
| author | Bartosz Barcinski <Bartosz.Barcinski@intel.com> | 2011-04-13 00:28:43 (GMT) |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 11:00:37 (GMT) |
| commit | 6cb4d6b382be6345c2d0c4b1b90dfdf9af32da7e (patch) | |
| tree | 9d9849a1557888051429a36d4ffa2cbd2dd3591e /drivers/scsi/isci/remote_device.c | |
| parent | 467e855a0331f619f41fbf7391bc29ec0ca923a0 (diff) | |
| download | linux-fsl-qoriq-6cb4d6b382be6345c2d0c4b1b90dfdf9af32da7e.tar.xz | |
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/remote_device.c')
| -rw-r--r-- | drivers/scsi/isci/remote_device.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c index 320850c..9301e25 100644 --- a/drivers/scsi/isci/remote_device.c +++ b/drivers/scsi/isci/remote_device.c @@ -202,8 +202,6 @@ static enum sci_status isci_remote_device_construct( sci_object_set_association(to_sci_dev(isci_device), isci_device); - BUG_ON(port->isci_host == NULL); - /* start the device. */ status = scic_remote_device_start(to_sci_dev(isci_device), ISCI_REMOTE_DEVICE_START_TIMEOUT); @@ -257,8 +255,12 @@ isci_remote_device_alloc(struct isci_host *ihost, struct isci_port *iport) return NULL; } - BUG_ON(!list_empty(&idev->reqs_in_process)); - BUG_ON(!list_empty(&idev->node)); + if (WARN_ONCE(!list_empty(&idev->reqs_in_process), "found requests in process\n")) + return NULL; + + if (WARN_ONCE(!list_empty(&idev->node), "found non-idle remote device\n")) + return NULL; + isci_remote_device_change_state(idev, isci_freed); return idev; |