Re: [PATCH] usb: dwc3: gadget: pass a condition to dev_WARN_ONCE()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Felipe,

On Thu, Dec 10, 2015 at 01:09:58PM -0600, Felipe Balbi wrote:
> instead of using:
> 
> 	if (condition) {
> 		dev_WARN_ONCE(dev, true, "foo");
> 		return -EINVAL;
> 	}
> 
> let's use:
> 
> 	if (dev_WARN_ONCE(dev, condition, "foo"))
> 		return -EINVAL;
> 
> Signed-off-by: Felipe Balbi <balbi@xxxxxx>
> ---
>  drivers/usb/dwc3/gadget.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
> index 3063c5ba5563..96cc1d756d99 100644
> --- a/drivers/usb/dwc3/gadget.c
> +++ b/drivers/usb/dwc3/gadget.c
> @@ -661,11 +661,10 @@ static int dwc3_gadget_ep_enable(struct usb_ep *ep,
>  	dep = to_dwc3_ep(ep);
>  	dwc = dep->dwc;
>  
> -	if (dep->flags & DWC3_EP_ENABLED) {
> -		dev_WARN_ONCE(dwc->dev, true, "%s is already enabled\n",
> -				dep->name);
> +	if (dev_WARN_ONCE(dwc->dev, dep->flags & DWC3_EP_ENABLED,
> +					"%s is already enabled\n",
> +					dep->name))
>  		return 0;
> -	}
>  
>  	spin_lock_irqsave(&dwc->lock, flags);
>  	ret = __dwc3_gadget_ep_enable(dep, desc, ep->comp_desc, false, false);
> @@ -689,11 +688,10 @@ static int dwc3_gadget_ep_disable(struct usb_ep *ep)
>  	dep = to_dwc3_ep(ep);
>  	dwc = dep->dwc;
>  
> -	if (!(dep->flags & DWC3_EP_ENABLED)) {
> -		dev_WARN_ONCE(dwc->dev, true, "%s is already disabled\n",
> -				dep->name);
> +	if (dev_WARN_ONCE(dwc->dev, !(dep->flags & DWC3_EP_ENABLED)

You missed a , after the condition.

Br, David

> +					"%s is already disabled\n",
> +					dep->name))
>  		return 0;
> -	}
>  
>  	spin_lock_irqsave(&dwc->lock, flags);
>  	ret = __dwc3_gadget_ep_disable(dep);
> -- 
> 2.6.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux