Staging: bcm: Clean up patch that calls semaphore down_trylock directly.

This patch evaluates/calls the down_trylock locking
function directly, instead of storing the results
in a variable and evaluating the variable. These
changes were made in:
IOCTL_BCM_BUFFER_DOWNLOAD_STOP and
IOCTL_BCM_BUFFER_DOWNLOAD_START.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index d0a0b10c5d4ecd1dba037272034fc9feab1cb597..e6b20c80db5205d06b7c6cec08b5eecf2d2080d0 100644 (file)
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -756,8 +756,7 @@ cntrlEnd:
        }
 
        case IOCTL_BCM_BUFFER_DOWNLOAD_START: {
-               INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock);
-               if (NVMAccess) {
+               if (down_trylock(&Adapter->NVMRdmWrmLock)) {
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
                                        "IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");
                        return -EACCES;
@@ -862,9 +861,7 @@ cntrlEnd:
        }
 
        case IOCTL_BCM_BUFFER_DOWNLOAD_STOP: {
-               INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock);
-
-               if (NVMAccess) {
+               if (down_trylock(&Adapter->NVMRdmWrmLock)) {
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
                                        "FW download blocked as EEPROM Read/Write is in progress\n");
                        up(&Adapter->fw_download_sema);