usb: host: ohci-tmio: Remove redundant if statement

[PATCH -next] usb: host: ohci-tmio: Remove redundant if statement

Posted by Li Zhengyu 3 years, 11 months ago

(ret == 0) is true when (ret) is false, so remove it.
Also remove unreachable code.

Signed-off-by: Li Zhengyu <lizhengyu3@huawei.com>
---
 drivers/usb/host/ohci-tmio.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
index 49539b9f0e94..6bcb0cb53f7c 100644
--- a/drivers/usb/host/ohci-tmio.c
+++ b/drivers/usb/host/ohci-tmio.c
@@ -243,12 +243,8 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev)
 	ret = usb_add_hcd(hcd, irq, 0);
 	if (ret)
 		goto err_add_hcd;
-
 	device_wakeup_enable(hcd->self.controller);
-	if (ret == 0)
-		return ret;
-
-	usb_remove_hcd(hcd);
+	return ret;
 
 err_add_hcd:
 	tmio_stop_hc(dev);
-- 
2.17.1

Re: [PATCH -next] usb: host: ohci-tmio: Remove redundant if statement

Posted by Dmitry Baryshkov 3 years, 11 months ago

ср, 18 мая 2022 г. в 05:45, Li Zhengyu <lizhengyu3@huawei.com>:
>
> (ret == 0) is true when (ret) is false, so remove it.
> Also remove unreachable code.
>
> Signed-off-by: Li Zhengyu <lizhengyu3@huawei.com>
> ---
>  drivers/usb/host/ohci-tmio.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
> index 49539b9f0e94..6bcb0cb53f7c 100644
> --- a/drivers/usb/host/ohci-tmio.c
> +++ b/drivers/usb/host/ohci-tmio.c
> @@ -243,12 +243,8 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev)
>         ret = usb_add_hcd(hcd, irq, 0);
>         if (ret)
>                 goto err_add_hcd;
> -
>         device_wakeup_enable(hcd->self.controller);

I think the proper patch would be to check the return value of
device_wakeup_enable(), so NAK.

> -       if (ret == 0)
> -               return ret;
> -
> -       usb_remove_hcd(hcd);
> +       return ret;
>
>  err_add_hcd:
>         tmio_stop_hc(dev);
> --
> 2.17.1
>


-- 
With best wishes
Dmitry

Re: [PATCH -next] usb: host: ohci-tmio: Remove redundant if statement

Posted by lizhengyu (E) 3 years, 11 months ago

On Wed, 18 May 2022 18:30:15 +0300, Dmitry Baryshkov 
<dbaryshkov@gmail.com> wrote:
> ср, 18 мая 2022 г. в 05:45, Li Zhengyu <lizhengyu3@huawei.com>:
>> (ret == 0) is true when (ret) is false, so remove it.
>> Also remove unreachable code.
>>
>> Signed-off-by: Li Zhengyu <lizhengyu3@huawei.com>
>> ---
>>   drivers/usb/host/ohci-tmio.c | 6 +-----
>>   1 file changed, 1 insertion(+), 5 deletions(-)
>>
>> diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
>> index 49539b9f0e94..6bcb0cb53f7c 100644
>> --- a/drivers/usb/host/ohci-tmio.c
>> +++ b/drivers/usb/host/ohci-tmio.c
>> @@ -243,12 +243,8 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev)
>>          ret = usb_add_hcd(hcd, irq, 0);
>>          if (ret)
>>                  goto err_add_hcd;
>> -
>>          device_wakeup_enable(hcd->self.controller);
> I think the proper patch would be to check the return value of
> device_wakeup_enable(), so NAK.
>
>> -       if (ret == 0)
>> -               return ret;
>> -
>> -       usb_remove_hcd(hcd);
>> +       return ret;
>>
>>   err_add_hcd:
>>          tmio_stop_hc(dev);
>> --
>> 2.17.1
>>
>
Thanks, I will fix it soon.

Re: [PATCH -next] usb: host: ohci-tmio: Remove redundant if statement

Posted by Alan Stern 3 years, 11 months ago

On Wed, May 18, 2022 at 10:43:47AM +0800, Li Zhengyu wrote:
> (ret == 0) is true when (ret) is false, so remove it.
> Also remove unreachable code.
> 
> Signed-off-by: Li Zhengyu <lizhengyu3@huawei.com>
> ---

Acked-by: Alan Stern <stern@rowland.harvard.edu>

>  drivers/usb/host/ohci-tmio.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
> index 49539b9f0e94..6bcb0cb53f7c 100644
> --- a/drivers/usb/host/ohci-tmio.c
> +++ b/drivers/usb/host/ohci-tmio.c
> @@ -243,12 +243,8 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev)
>  	ret = usb_add_hcd(hcd, irq, 0);
>  	if (ret)
>  		goto err_add_hcd;
> -
>  	device_wakeup_enable(hcd->self.controller);
> -	if (ret == 0)
> -		return ret;
> -
> -	usb_remove_hcd(hcd);
> +	return ret;
>  
>  err_add_hcd:
>  	tmio_stop_hc(dev);
> -- 
> 2.17.1
>