2015-10-21 19:07:37

by punit vara

Subject: [PATCH v2 05/15] net: wireless: ti: Return flow can be simplified for wl1271_cmd_interrogate

Remove int ret suggested by kbuild test robot

This patch is to the wlcore/acx.c file that fixes up warning
reported by coccicheck:

WARNING: end returns can be simplified if negative or 0 value

Prefer direct return value instead of writing 2-3 more sentence.

Signed-off-by: Punit Vara <[email protected]>
---
drivers/net/wireless/ti/wlcore/acx.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
index f28fa3b..6b566d9 100644
--- a/drivers/net/wireless/ti/wlcore/acx.c
+++ b/drivers/net/wireless/ti/wlcore/acx.c
@@ -158,16 +158,11 @@ out:
int wl1271_acx_mem_map(struct wl1271 *wl, struct acx_header *mem_map,
size_t len)
{
- int ret;

wl1271_debug(DEBUG_ACX, "acx mem map");

- ret = wl1271_cmd_interrogate(wl, ACX_MEM_MAP, mem_map,
+ return wl1271_cmd_interrogate(wl, ACX_MEM_MAP, mem_map,
sizeof(struct acx_header), len);
- if (ret < 0)
- return ret;
-
- return 0;
}

int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl)
--
2.5.3

2015-10-21 19:07:44

by punit vara

Subject: [PATCH v2 08/15] net: wireless: simplify return flow for usb_control_msg

remove int ret suggested by Jiri Slaby
This patch is to the at76c50x-usb.c file that fixes up warning
reported by coccicheck:

WARNING: end returns can be simplified if negative or 0 value

Prefer direct return value instead of writing 2-3 more sentence.

Signed-off-by: Punit Vara <[email protected]>
---
drivers/net/wireless/at76c50x-usb.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index dab2513..b4aa062 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -543,14 +543,10 @@ static void at76_ledtrig_tx_activity(void)

static int at76_remap(struct usb_device *udev)
{
- int ret;
- ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0a,
+ return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0a,
USB_TYPE_VENDOR | USB_DIR_OUT |
USB_RECIP_INTERFACE, 0, 0, NULL, 0,
USB_CTRL_GET_TIMEOUT);
- if (ret < 0)
- return ret;
- return 0;
}

static int at76_get_op_mode(struct usb_device *udev)
--
2.5.3

2015-10-21 22:00:07

by Sergei Shtylyov

Subject: Re: [PATCH v2 05/15] net: wireless: ti: Return flow can be simplified for wl1271_cmd_interrogate

On 10/21/2015 10:07 PM, Punit Vara wrote:

> Remove int ret suggested by kbuild test robot
>
> This patch is to the wlcore/acx.c file that fixes up warning
> reported by coccicheck:
>
> WARNING: end returns can be simplified if negative or 0 value
>
> Prefer direct return value instead of writing 2-3 more sentence.
>
> Signed-off-by: Punit Vara <[email protected]>
> ---
> drivers/net/wireless/ti/wlcore/acx.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
> index f28fa3b..6b566d9 100644
> --- a/drivers/net/wireless/ti/wlcore/acx.c
> +++ b/drivers/net/wireless/ti/wlcore/acx.c
> @@ -158,16 +158,11 @@ out:
> int wl1271_acx_mem_map(struct wl1271 *wl, struct acx_header *mem_map,
> size_t len)
> {
> - int ret;
>

You now need to kill this empty line as well.

[...]

MBR, Sergei+

2015-10-22 06:54:19

by Eliad Peller

Subject: Re: [PATCH v2 05/15] net: wireless: ti: Return flow can be simplified for wl1271_cmd_interrogate

On Wed, Oct 21, 2015 at 10:07 PM, Punit Vara <[email protected]> wrote:
> Remove int ret suggested by kbuild test robot
>
> This patch is to the wlcore/acx.c file that fixes up warning
> reported by coccicheck:
>
> WARNING: end returns can be simplified if negative or 0 value
>
> Prefer direct return value instead of writing 2-3 more sentence.
>
> Signed-off-by: Punit Vara <[email protected]>
> ---
> drivers/net/wireless/ti/wlcore/acx.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
> index f28fa3b..6b566d9 100644
> --- a/drivers/net/wireless/ti/wlcore/acx.c
> +++ b/drivers/net/wireless/ti/wlcore/acx.c
> @@ -158,16 +158,11 @@ out:
> int wl1271_acx_mem_map(struct wl1271 *wl, struct acx_header *mem_map,
> size_t len)
> {
> - int ret;
>
> wl1271_debug(DEBUG_ACX, "acx mem map");
>
> - ret = wl1271_cmd_interrogate(wl, ACX_MEM_MAP, mem_map,
> + return wl1271_cmd_interrogate(wl, ACX_MEM_MAP, mem_map,
> sizeof(struct acx_header), len);
> - if (ret < 0)
> - return ret;
> -
> - return 0;
> }
>
this changes the return value in case of positive values.
have you verified it can't happen / won't affect the code flow?
i'm not sure you really want to blindly patch it...

Eliad.