Commit ea9a8dae authored by Martin Kepplinger's avatar Martin Kepplinger Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: make spin_lock_irq() human readable 



Don't require FIRMWAREbDownload() to, first off, unlock a held lock.
Thus do all locking in main_usb.c and hold it for a insignificantly
shorter period of time. This makes the affected area significantly more
readable though.

Signed-off-by: default avatarMartin Kepplinger <martink@posteo.de>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc5cf656

drivers/staging/vt6656/firmware.c

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ int FIRMWAREbDownload(struct vnt_private *pDevice) __must_hold(&pDevice->lock) 
	int ii, rc;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Download firmware\n");

	spin_unlock_irq(&pDevice->lock);



	rc = request_firmware(&fw, FIRMWARE_NAME, dev);

	if (rc) {
@@ -92,7 +91,6 @@ int FIRMWAREbDownload(struct vnt_private *pDevice) __must_hold(&pDevice->lock) 
out:

	kfree(pBuffer);



	spin_lock_irq(&pDevice->lock);

	return result;

}

MODULE_FIRMWARE(FIRMWARE_NAME);

drivers/staging/vt6656/main_usb.c

+4 −1
Original line number Diff line number Diff line
@@ -319,7 +319,11 @@ static int device_init_registers(struct vnt_private *pDevice) 
	memcpy(pDevice->abySNAP_Bridgetunnel, abySNAP_Bridgetunnel, ETH_ALEN);



	if (!FIRMWAREbCheckVersion(pDevice)) {



		spin_unlock_irq(&pDevice->lock);

		if (FIRMWAREbDownload(pDevice) == true) {



			spin_lock_irq(&pDevice->lock);

			if (FIRMWAREbBrach2Sram(pDevice) == false) {

				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

					" FIRMWAREbBrach2Sram fail\n");
@@ -329,7 +333,6 @@ static int device_init_registers(struct vnt_private *pDevice) 
		} else {

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

				" FIRMWAREbDownload fail\n");

			spin_unlock_irq(&pDevice->lock);

			return false;

		}

	}