Staging: rtlwifi: halmac: Remove unnecessary 'out of memory' messages

Remove unnecessary messages because OOM (Out Of Memory Manager)
reports memory allocation fail messages. The return value
is clear regarding the problem, so there is no need for the
'out of memory' comments. Also, delete braces {} for single
if statement blocks to improve the coding style.

Fix issues found by by checkpatch.pl.
WARNING: Possible unnecessary 'out of memory' message.
WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Georgiana Chelu <georgiana.chelu93@example.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
index f33024e4d853de78ae699f50a6b77b177c1a54ae..29dd9cf28db77d7e3690de25d60aec33815de136 100644 (file)
--- a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
+++ b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
@@ -276,17 +276,13 @@ halmac_dump_efuse_drv_88xx(struct halmac_adapter *halmac_adapter)
 
        if (!halmac_adapter->hal_efuse_map) {
                halmac_adapter->hal_efuse_map = kzalloc(efuse_size, GFP_KERNEL);
-               if (!halmac_adapter->hal_efuse_map) {
-                       pr_err("[ERR]halmac allocate efuse map Fail!!\n");
+               if (!halmac_adapter->hal_efuse_map)
                        return HALMAC_RET_MALLOC_FAIL;
-               }
        }
 
        efuse_map = kzalloc(efuse_size, GFP_KERNEL);
-       if (!efuse_map) {
-               /* out of memory */
+       if (!efuse_map)
                return HALMAC_RET_MALLOC_FAIL;
-       }
 
        if (halmac_read_hw_efuse_88xx(halmac_adapter, 0, efuse_size,
                                      efuse_map) != HALMAC_RET_SUCCESS) {
@@ -325,10 +321,8 @@ halmac_dump_efuse_fw_88xx(struct halmac_adapter *halmac_adapter)
        if (!halmac_adapter->hal_efuse_map) {
                halmac_adapter->hal_efuse_map = kzalloc(
                        halmac_adapter->hw_config_info.efuse_size, GFP_KERNEL);
-               if (!halmac_adapter->hal_efuse_map) {
-                       /* out of memory */
+               if (!halmac_adapter->hal_efuse_map)
                        return HALMAC_RET_MALLOC_FAIL;
-               }
        }
 
        if (!halmac_adapter->hal_efuse_map_valid) {
@@ -537,10 +531,8 @@ halmac_read_logical_efuse_map_88xx(struct halmac_adapter *halmac_adapter,
 
        if (!halmac_adapter->hal_efuse_map_valid) {
                efuse_map = kzalloc(efuse_size, GFP_KERNEL);
-               if (!efuse_map) {
-                       pr_err("[ERR]halmac allocate local efuse map Fail!!\n");
+               if (!efuse_map)
                        return HALMAC_RET_MALLOC_FAIL;
-               }
 
                status = halmac_func_read_efuse_88xx(halmac_adapter, 0,
                                                     efuse_size, efuse_map);
@@ -554,7 +546,6 @@ halmac_read_logical_efuse_map_88xx(struct halmac_adapter *halmac_adapter,
                        halmac_adapter->hal_efuse_map =
                                kzalloc(efuse_size, GFP_KERNEL);
                        if (!halmac_adapter->hal_efuse_map) {
-                               pr_err("[ERR]halmac allocate efuse map Fail!!\n");
                                kfree(efuse_map);
                                return HALMAC_RET_MALLOC_FAIL;
                        }
@@ -592,10 +583,8 @@ halmac_func_write_logical_efuse_88xx(struct halmac_adapter *halmac_adapter,
        driver_adapter = halmac_adapter->driver_adapter;
 
        eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);
-       if (!eeprom_map) {
-               /* out of memory */
+       if (!eeprom_map)
                return HALMAC_RET_MALLOC_FAIL;
-       }
        memset(eeprom_map, 0xFF, eeprom_size);
 
        status = halmac_read_logical_efuse_map_88xx(halmac_adapter, eeprom_map);
@@ -687,10 +676,8 @@ halmac_func_pg_efuse_by_map_88xx(struct halmac_adapter *halmac_adapter,
        enum halmac_ret_status status = HALMAC_RET_SUCCESS;
 
        eeprom_mask_updated = kzalloc(eeprom_mask_size, GFP_KERNEL);
-       if (!eeprom_mask_updated) {
-               /* out of memory */
+       if (!eeprom_mask_updated)
                return HALMAC_RET_MALLOC_FAIL;
-       }
 
        status = halmac_update_eeprom_mask_88xx(halmac_adapter, pg_efuse_info,
                                                eeprom_mask_updated);
@@ -743,12 +730,10 @@ halmac_update_eeprom_mask_88xx(struct halmac_adapter *halmac_adapter,
        driver_adapter = halmac_adapter->driver_adapter;
 
        eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);
-       if (!eeprom_map) {
-               /* out of memory */
+       if (!eeprom_map)
                return HALMAC_RET_MALLOC_FAIL;
-       }
-       memset(eeprom_map, 0xFF, eeprom_size);
 
+       memset(eeprom_map, 0xFF, eeprom_size);
        memset(eeprom_mask_updated, 0x00, pg_efuse_info->efuse_mask_size);
 
        status = halmac_read_logical_efuse_map_88xx(halmac_adapter, eeprom_map);
@@ -2548,10 +2533,8 @@ halmac_parse_efuse_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,
                halmac_adapter->efuse_segment_size = segment_size;
 
        eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);
-       if (!eeprom_map) {
-               /* out of memory */
+       if (!eeprom_map)
                return HALMAC_RET_MALLOC_FAIL;
-       }
        memset(eeprom_map, 0xFF, eeprom_size);
 
        spin_lock(&halmac_adapter->efuse_lock);
@@ -3354,10 +3337,8 @@ enum halmac_ret_status halmac_query_dump_logical_efuse_status_88xx(
                *size = eeprom_size;
 
                eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);
-               if (!eeprom_map) {
-                       /* out of memory */
+               if (!eeprom_map)
                        return HALMAC_RET_MALLOC_FAIL;
-               }
                memset(eeprom_map, 0xFF, eeprom_size);
 
                if (halmac_eeprom_parser_88xx(
@@ -3578,10 +3559,8 @@ halmac_verify_send_rsvd_page_88xx(struct halmac_adapter *halmac_adapter)
 
        rsvd_buf = kzalloc(h2c_pkt_verify_size, GFP_KERNEL);
 
-       if (!rsvd_buf) {
-               /*pr_err("[ERR]rsvd buffer malloc fail!!\n");*/
+       if (!rsvd_buf)
                return HALMAC_RET_MALLOC_FAIL;
-       }
 
        memset(rsvd_buf, (u8)h2c_pkt_verify_payload, h2c_pkt_verify_size);
 
@@ -3598,7 +3577,6 @@ halmac_verify_send_rsvd_page_88xx(struct halmac_adapter *halmac_adapter)
                            GFP_KERNEL);
 
        if (!rsvd_page) {
-               pr_err("[ERR]rsvd page malloc fail!!\n");
                kfree(rsvd_buf);
                return HALMAC_RET_MALLOC_FAIL;
        }