[PATCH] wl1251: cmd: remove redundant assignment

[samirweng1979]

From: wengjianfeng <wengjianf...@yulong.com>

-ENOMEM has been used as a return value,it is not necessary to
assign it, and if kzalloc fail,not need free it,so just return
-ENOMEM when kzalloc fail.

Signed-off-by: wengjianfeng <wengjianf...@yulong.com>
---
 drivers/net/wireless/ti/wl1251/cmd.c | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/drivers/net/wireless/ti/wl1251/cmd.c 
b/drivers/net/wireless/ti/wl1251/cmd.c
index e1095b8..498c8db 100644
--- a/drivers/net/wireless/ti/wl1251/cmd.c
+++ b/drivers/net/wireless/ti/wl1251/cmd.c
@@ -175,10 +175,8 @@ int wl1251_cmd_vbm(struct wl1251 *wl, u8 identity,
        wl1251_debug(DEBUG_CMD, "cmd vbm");
 
        vbm = kzalloc(sizeof(*vbm), GFP_KERNEL);
-       if (!vbm) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!vbm)
+               return -ENOMEM;
 
        /* Count and period will be filled by the target */
        vbm->tim.bitmap_ctrl = bitmap_control;
@@ -213,10 +211,8 @@ int wl1251_cmd_data_path_rx(struct wl1251 *wl, u8 channel, 
bool enable)
        wl1251_debug(DEBUG_CMD, "cmd data path");
 
        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
-       if (!cmd) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!cmd)
+               return -ENOMEM;
 
        cmd->channel = channel;
 
@@ -279,10 +275,8 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 
channel,
        u8 *bssid;
 
        join = kzalloc(sizeof(*join), GFP_KERNEL);
-       if (!join) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!join)
+               return -ENOMEM;
 
        wl1251_debug(DEBUG_CMD, "cmd join%s ch %d %d/%d",
                     bss_type == BSS_TYPE_IBSS ? " ibss" : "",
@@ -324,10 +318,8 @@ int wl1251_cmd_ps_mode(struct wl1251 *wl, u8 ps_mode)
        wl1251_debug(DEBUG_CMD, "cmd set ps mode");
 
        ps_params = kzalloc(sizeof(*ps_params), GFP_KERNEL);
-       if (!ps_params) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!ps_params)
+               return -ENOMEM;
 
        ps_params->ps_mode = ps_mode;
        ps_params->send_null_data = 1;
@@ -356,10 +348,8 @@ int wl1251_cmd_read_memory(struct wl1251 *wl, u32 addr, 
void *answer,
        wl1251_debug(DEBUG_CMD, "cmd read memory");
 
        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
-       if (!cmd) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!cmd)
+               return -ENOMEM;
 
        WARN_ON(len > MAX_READ_SIZE);
        len = min_t(size_t, len, MAX_READ_SIZE);
@@ -401,10 +391,8 @@ int wl1251_cmd_template_set(struct wl1251 *wl, u16 cmd_id,
        cmd_len = ALIGN(sizeof(*cmd) + buf_len, 4);
 
        cmd = kzalloc(cmd_len, GFP_KERNEL);
-       if (!cmd) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!cmd)
+               return -ENOMEM;
 
        cmd->size = cpu_to_le16(buf_len);
 
-- 
1.9.1