]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
staging: bcm: don't cast kzalloc() return value
authorMihnea Dobrescu-Balaur <mihneadb@gmail.com>
Sun, 10 Mar 2013 12:48:27 +0000 (14:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Mar 2013 16:15:32 +0000 (09:15 -0700)
Signed-off-by: Mihnea Dobrescu-Balaur <mihneadb@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/bcm/nvm.c

index e6152f4df14b4beaf515907e47098740613c5c82..bea1330f7ea6952aae258d26af35c114ed5f8e3a 100644 (file)
@@ -2228,20 +2228,20 @@ int BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter)
                BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_PRINTK, 0, 0, "Adapter structure point is NULL");
                return -EINVAL;
        }
-       psAdapter->psFlashCSInfo = (struct bcm_flash_cs_info *)kzalloc(sizeof(struct bcm_flash_cs_info), GFP_KERNEL);
+       psAdapter->psFlashCSInfo = kzalloc(sizeof(struct bcm_flash_cs_info), GFP_KERNEL);
        if (psAdapter->psFlashCSInfo == NULL) {
                BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_PRINTK, 0, 0, "Can't Allocate memory for Flash 1.x");
                return -ENOMEM;
        }
 
-       psAdapter->psFlash2xCSInfo = (struct bcm_flash2x_cs_info *)kzalloc(sizeof(struct bcm_flash2x_cs_info), GFP_KERNEL);
+       psAdapter->psFlash2xCSInfo = kzalloc(sizeof(struct bcm_flash2x_cs_info), GFP_KERNEL);
        if (!psAdapter->psFlash2xCSInfo) {
                BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_PRINTK, 0, 0, "Can't Allocate memory for Flash 2.x");
                kfree(psAdapter->psFlashCSInfo);
                return -ENOMEM;
        }
 
-       psAdapter->psFlash2xVendorInfo = (struct bcm_flash2x_vendor_info *)kzalloc(sizeof(struct bcm_flash2x_vendor_info), GFP_KERNEL);
+       psAdapter->psFlash2xVendorInfo = kzalloc(sizeof(struct bcm_flash2x_vendor_info), GFP_KERNEL);
        if (!psAdapter->psFlash2xVendorInfo) {
                BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_PRINTK, 0, 0, "Can't Allocate Vendor Info Memory for Flash 2.x");
                kfree(psAdapter->psFlashCSInfo);
@@ -4074,7 +4074,7 @@ int BcmCopySection(struct bcm_mini_adapter *Adapter,
        else
                BuffSize = numOfBytes;
 
-       pBuff = (PCHAR)kzalloc(BuffSize, GFP_KERNEL);
+       pBuff = kzalloc(BuffSize, GFP_KERNEL);
        if (!pBuff) {
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory allocation failed.. ");
                return -ENOMEM;
@@ -4154,7 +4154,7 @@ int SaveHeaderIfPresent(struct bcm_mini_adapter *Adapter, PUCHAR pBuff, unsigned
        }
        /* If Header is present overwrite passed buffer with this */
        if (bHasHeader && (Adapter->bHeaderChangeAllowed == FALSE)) {
-               pTempBuff = (PUCHAR)kzalloc(HeaderSizeToProtect, GFP_KERNEL);
+               pTempBuff = kzalloc(HeaderSizeToProtect, GFP_KERNEL);
                if (!pTempBuff) {
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory allocation failed");
                        return -ENOMEM;
@@ -4563,7 +4563,7 @@ static int CorruptDSDSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_sect
                }
        }
 
-       pBuff = (PUCHAR)kzalloc(MAX_RW_SIZE, GFP_KERNEL);
+       pBuff = kzalloc(MAX_RW_SIZE, GFP_KERNEL);
        if (!pBuff) {
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Can't allocate memorey");
                return -ENOMEM;
@@ -4622,7 +4622,7 @@ static int CorruptISOSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_sect
                return SECTOR_IS_NOT_WRITABLE;
        }
 
-       pBuff = (PUCHAR)kzalloc(MAX_RW_SIZE, GFP_KERNEL);
+       pBuff = kzalloc(MAX_RW_SIZE, GFP_KERNEL);
        if (!pBuff) {
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Can't allocate memorey");
                return -ENOMEM;