2019-01-23 14:34:53

by Yue Haibing

Subject: [PATCH -next] usb: gadget: Remove dead branch code

'num' is a u8 variable, it never greater than 255,
So the if branch is dead code and can be removed.

Signed-off-by: YueHaibing <[email protected]>
---
drivers/usb/gadget/function/uvc_configfs.c | 8 --------
1 file changed, 8 deletions(-)

diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index bc1e2af..8fe85cb 100644
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -1570,10 +1570,6 @@ uvcg_uncompressed_##cname##_store(struct config_item *item, \
if (ret) \
goto end; \
\
- if (num > 255) { \
- ret = -EINVAL; \
- goto end; \
- } \
u->desc.aname = num; \
ret = len; \
end: \
@@ -1767,10 +1763,6 @@ uvcg_mjpeg_##cname##_store(struct config_item *item, \
if (ret) \
goto end; \
\
- if (num > 255) { \
- ret = -EINVAL; \
- goto end; \
- } \
u->desc.aname = num; \
ret = len; \
end: \
--
2.7.0

2019-03-06 00:54:54

by Laurent Pinchart

Subject: Re: [PATCH -next] usb: gadget: Remove dead branch code

Hello YueHaibing,

Thank you for the patch.

On Wed, Jan 23, 2019 at 10:31:36PM +0800, YueHaibing wrote:
> 'num' is a u8 variable, it never greater than 255,
> So the if branch is dead code and can be removed.
>
> Signed-off-by: YueHaibing <[email protected]>

Reviewed-by: Laurent Pinchart <[email protected]>

> ---
> drivers/usb/gadget/function/uvc_configfs.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
> index bc1e2af..8fe85cb 100644
> --- a/drivers/usb/gadget/function/uvc_configfs.c
> +++ b/drivers/usb/gadget/function/uvc_configfs.c
> @@ -1570,10 +1570,6 @@ uvcg_uncompressed_##cname##_store(struct config_item *item, \
> if (ret) \
> goto end; \
> \
> - if (num > 255) { \
> - ret = -EINVAL; \
> - goto end; \
> - } \
> u->desc.aname = num; \
> ret = len; \
> end: \
> @@ -1767,10 +1763,6 @@ uvcg_mjpeg_##cname##_store(struct config_item *item, \
> if (ret) \
> goto end; \
> \
> - if (num > 255) { \
> - ret = -EINVAL; \
> - goto end; \
> - } \
> u->desc.aname = num; \
> ret = len; \
> end: \

--
Regards,

Laurent Pinchart