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: Martin Kepplinger <martink@posteo.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c
index 15c1e861c84b696e38da4be1764daeb99571bf91..afb79c66a9333c750746632d242f345476a34ef7 100644 (file)
--- a/drivers/staging/vt6656/firmware.c
+++ b/drivers/staging/vt6656/firmware.c
@@ -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 @@ free_fw:
 out:
        kfree(pBuffer);
 
-       spin_lock_irq(&pDevice->lock);
        return result;
 }
 MODULE_FIRMWARE(FIRMWARE_NAME);

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 3c9323069e01c265f2e88a6eab6e319ff515776c..1dc02c4abbedf0836afcc3048829a67b71765559 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -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;
                }
        }