Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cb4d6b3 authored by Bartosz Barcinski's avatar Bartosz Barcinski Committed by Dan Williams
Browse files

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: default avatarMaciej Patelczyk <maciej.patelczyk@intel.com>
[changed some survivable bug conditions to WARN_ONCE]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 467e855a

drivers/scsi/isci/core/scic_sds_request.c

+0 −1
Original line number Diff line number Diff line
@@ -1635,7 +1635,6 @@ static void scic_sds_request_completed_state_enter( 
	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_request *ireq = sci_object_get_association(sci_req);





	SET_STATE_HANDLER(sci_req,

			  scic_sds_request_state_handler_table,

			  SCI_BASE_REQUEST_STATE_COMPLETED);

drivers/scsi/isci/init.c

+0 −4
Original line number Diff line number Diff line
@@ -362,8 +362,6 @@ static int isci_setup_interrupts(struct pci_dev *pdev) 
		else

			isr = isci_msix_isr;



		BUG_ON(!isci_host);



		err = devm_request_irq(&pdev->dev, msix->vector, isr, 0,

				       DRV_NAME"-msix", isci_host);

		if (!err)
@@ -379,13 +377,11 @@ static int isci_setup_interrupts(struct pci_dev *pdev) 
		pci_disable_msix(pdev);

		goto intx;

	}



	return 0;



 intx:

	err = devm_request_irq(&pdev->dev, pdev->irq, isci_intx_isr,

			       IRQF_SHARED, DRV_NAME"-intx", pdev);



	return err;

}

drivers/scsi/isci/port.c

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ void isci_port_link_up( 
	unsigned long success = true;



	BUG_ON(isci_phy->isci_port != NULL);



	isci_phy->isci_port = isci_port;



	dev_dbg(&isci_host->pdev->dev,

drivers/scsi/isci/remote_device.c

+6 −4
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/isci/request.c

+0 −1
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ int isci_request_execute( 


 out:

	if (status != SCI_SUCCESS) {



		/* release dma memory on failure. */

		isci_request_free(isci_host, request);

		request = NULL;