[PATCH] mmc: vub300: remove unreachable return value handling

[PATCH] mmc: vub300: remove unreachable return value handling

[Nicholas Mc Guire]

Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
---

The return value of wait_for_completion_timeout is unsigned long, 
as it is used here for wait_for_completion_timeout only the type 
of commretval was changed to unsigned long.

As wait_for_completion_timeout does not return negative values
the commretval < 0 case is not reachable and can be removed.

This was only compile-tested for x86_64_defconfig + CONFIG_MMC=m,
CONFIG_MMC_VUB300=m

Patch is against 3.19.0-rc4 -next-20150116

 drivers/mmc/host/vub300.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
index 4262296..fbabbb8 100644
--- a/drivers/mmc/host/vub300.c
+++ b/drivers/mmc/host/vub300.c
@@ -659,7 +659,7 @@ static void __vub300_irqpoll_response(struct vub300_mmc_host *vub300)
 static void __do_poll(struct vub300_mmc_host *vub300)
 {
 	/* cmd_mutex is held by vub300_pollwork_thread */
-	long commretval;
+	unsigned long commretval;
 	mod_timer(&vub300->inactivity_timer, jiffies + HZ);
 	init_completion(&vub300->irqpoll_complete);
 	send_irqpoll(vub300);
@@ -671,8 +671,6 @@ static void __do_poll(struct vub300_mmc_host *vub300)
 		vub300->usb_timed_out = 1;
 		usb_kill_urb(vub300->command_out_urb);
 		usb_kill_urb(vub300->command_res_urb);
-	} else if (commretval < 0) {
-		vub300_queue_poll_work(vub300, 1);
 	} else { /* commretval > 0 */
 		__vub300_irqpoll_response(vub300);
 	}
-- 
1.7.10.4

Re: [PATCH] mmc: vub300: remove unreachable return value handling

[Ulf Hansson]

On 18 January 2015 at 02:51, Nicholas Mc Guire <der.herr@hofr.at> wrote:
> Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>

Thanks! Applied for next.

Kind regards
Uffe

> ---
>
> The return value of wait_for_completion_timeout is unsigned long,
> as it is used here for wait_for_completion_timeout only the type
> of commretval was changed to unsigned long.
>
> As wait_for_completion_timeout does not return negative values
> the commretval < 0 case is not reachable and can be removed.
>
> This was only compile-tested for x86_64_defconfig + CONFIG_MMC=m,
> CONFIG_MMC_VUB300=m
>
> Patch is against 3.19.0-rc4 -next-20150116
>
>  drivers/mmc/host/vub300.c |    4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
> index 4262296..fbabbb8 100644
> --- a/drivers/mmc/host/vub300.c
> +++ b/drivers/mmc/host/vub300.c
> @@ -659,7 +659,7 @@ static void __vub300_irqpoll_response(struct vub300_mmc_host *vub300)
>  static void __do_poll(struct vub300_mmc_host *vub300)
>  {
>         /* cmd_mutex is held by vub300_pollwork_thread */
> -       long commretval;
> +       unsigned long commretval;
>         mod_timer(&vub300->inactivity_timer, jiffies + HZ);
>         init_completion(&vub300->irqpoll_complete);
>         send_irqpoll(vub300);
> @@ -671,8 +671,6 @@ static void __do_poll(struct vub300_mmc_host *vub300)
>                 vub300->usb_timed_out = 1;
>                 usb_kill_urb(vub300->command_out_urb);
>                 usb_kill_urb(vub300->command_res_urb);
> -       } else if (commretval < 0) {
> -               vub300_queue_poll_work(vub300, 1);
>         } else { /* commretval > 0 */
>                 __vub300_irqpoll_response(vub300);
>         }
> --
> 1.7.10.4
>