Re: [PATCH 1/2] staging: greybus: add a single exit path to arche_platform_wd_irq()

[Ira Weiny]

Khadija Kamran wrote:
> arche_platform_wd_irq() function has two exit paths. To make the code
> more readable, use only one exit path.
> 
> Suggested-by: Alison Schofield <alison.schofield@xxxxxxxxx>

Reviewed-by: Ira Weiny <ira.weiny@xxxxxxxxx>

> Signed-off-by: Khadija Kamran <kamrankhadijadj@xxxxxxxxx>
> ---
>  drivers/staging/greybus/arche-platform.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c
> index fcbd5f71eff2..a64c1af091b0 100644
> --- a/drivers/staging/greybus/arche-platform.c
> +++ b/drivers/staging/greybus/arche-platform.c
> @@ -153,6 +153,7 @@ static irqreturn_t arche_platform_wd_irq_thread(int irq, void *devid)
>  static irqreturn_t arche_platform_wd_irq(int irq, void *devid)
>  {
>  	struct arche_platform_drvdata *arche_pdata = devid;
> +	irqreturn_t rc = IRQ_HANDLED;
>  	unsigned long flags;
>  
>  	spin_lock_irqsave(&arche_pdata->wake_lock, flags);
> @@ -180,9 +181,7 @@ static irqreturn_t arche_platform_wd_irq(int irq, void *devid)
>  						WD_STATE_COLDBOOT_START) {
>  					arche_platform_set_wake_detect_state(arche_pdata,
>  									     WD_STATE_COLDBOOT_TRIG);
> -					spin_unlock_irqrestore(&arche_pdata->wake_lock,
> -							       flags);
> -					return IRQ_WAKE_THREAD;
> +					rc = IRQ_WAKE_THREAD;
>  				}
>  			}
>  		}
> @@ -204,7 +203,7 @@ static irqreturn_t arche_platform_wd_irq(int irq, void *devid)
>  
>  	spin_unlock_irqrestore(&arche_pdata->wake_lock, flags);
>  
> -	return IRQ_HANDLED;
> +	return rc;
>  }
>  
>  /*
> -- 
> 2.34.1
> 
>