* [PATCH] USB: usbip: clean up mixed use of _irq() and _irqsave()
@ 2022-05-25 12:27 Dan Carpenter
2022-05-25 15:12 ` Shuah Khan
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2022-05-25 12:27 UTC (permalink / raw)
To: Valentina Manea
Cc: Shuah Khan, Greg Kroah-Hartman, linux-usb, kernel-janitors
It generally doesn't make sense to use _irq() and _irqsave() in the same
function because either some of the callers have disabled IRQs or they
haven't. In this case, the v_recv_cmd_submit() appears to always be
called with IRQs enabled so the code works fine. That means I could
convert it to either _irq() or _irqsave() but I chose to use _irqsave()
because it's more conservative and easier to review.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/usb/usbip/vudc_rx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/usbip/vudc_rx.c b/drivers/usb/usbip/vudc_rx.c
index 1e8a23d92cb4..d4a2f30a7580 100644
--- a/drivers/usb/usbip/vudc_rx.c
+++ b/drivers/usb/usbip/vudc_rx.c
@@ -104,18 +104,18 @@ static int v_recv_cmd_submit(struct vudc *udc,
if (pdu->base.direction == USBIP_DIR_IN)
address |= USB_DIR_IN;
- spin_lock_irq(&udc->lock);
+ spin_lock_irqsave(&udc->lock, flags);
urb_p->ep = vudc_find_endpoint(udc, address);
if (!urb_p->ep) {
/* we don't know the type, there may be isoc data! */
dev_err(&udc->pdev->dev, "request to nonexistent endpoint");
- spin_unlock_irq(&udc->lock);
+ spin_unlock_irqrestore(&udc->lock, flags);
usbip_event_add(&udc->ud, VUDC_EVENT_ERROR_TCP);
ret = -EPIPE;
goto free_urbp;
}
urb_p->type = urb_p->ep->type;
- spin_unlock_irq(&udc->lock);
+ spin_unlock_irqrestore(&udc->lock, flags);
urb_p->new = 1;
urb_p->seqnum = pdu->base.seqnum;
--
2.35.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] USB: usbip: clean up mixed use of _irq() and _irqsave()
2022-05-25 12:27 [PATCH] USB: usbip: clean up mixed use of _irq() and _irqsave() Dan Carpenter
@ 2022-05-25 15:12 ` Shuah Khan
0 siblings, 0 replies; 2+ messages in thread
From: Shuah Khan @ 2022-05-25 15:12 UTC (permalink / raw)
To: Dan Carpenter, Greg Kroah-Hartman
Cc: Shuah Khan, linux-usb, kernel-janitors, Valentina Manea, Shuah Khan
On 5/25/22 6:27 AM, Dan Carpenter wrote:
> It generally doesn't make sense to use _irq() and _irqsave() in the same
> function because either some of the callers have disabled IRQs or they
> haven't. In this case, the v_recv_cmd_submit() appears to always be
> called with IRQs enabled so the code works fine. That means I could
> convert it to either _irq() or _irqsave() but I chose to use _irqsave()
> because it's more conservative and easier to review.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/usb/usbip/vudc_rx.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/usbip/vudc_rx.c b/drivers/usb/usbip/vudc_rx.c
> index 1e8a23d92cb4..d4a2f30a7580 100644
> --- a/drivers/usb/usbip/vudc_rx.c
> +++ b/drivers/usb/usbip/vudc_rx.c
> @@ -104,18 +104,18 @@ static int v_recv_cmd_submit(struct vudc *udc,
> if (pdu->base.direction == USBIP_DIR_IN)
> address |= USB_DIR_IN;
>
> - spin_lock_irq(&udc->lock);
> + spin_lock_irqsave(&udc->lock, flags);
> urb_p->ep = vudc_find_endpoint(udc, address);
> if (!urb_p->ep) {
> /* we don't know the type, there may be isoc data! */
> dev_err(&udc->pdev->dev, "request to nonexistent endpoint");
> - spin_unlock_irq(&udc->lock);
> + spin_unlock_irqrestore(&udc->lock, flags);
> usbip_event_add(&udc->ud, VUDC_EVENT_ERROR_TCP);
> ret = -EPIPE;
> goto free_urbp;
> }
> urb_p->type = urb_p->ep->type;
> - spin_unlock_irq(&udc->lock);
> + spin_unlock_irqrestore(&udc->lock, flags);
>
> urb_p->new = 1;
> urb_p->seqnum = pdu->base.seqnum;
>
Thank you for the patch.
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
Greg, please pick this up.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-25 15:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-25 12:27 [PATCH] USB: usbip: clean up mixed use of _irq() and _irqsave() Dan Carpenter
2022-05-25 15:12 ` Shuah Khan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.