Commit 90948416 authored by Marcus Folkesson's avatar Marcus Folkesson Committed by Dmitry Torokhov

Input: pxrc - simplify mutex handling with guard macro

Use the guard(mutex) macro for handle mutex lock/unlocks.
Signed-off-by: default avatarMarcus Folkesson <marcus.folkesson@gmail.com>
Link: https://lore.kernel.org/r/20231202-pxrc-guard-v3-1-2ca8bc8cf689@gmail.comSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent d3e09f57
...@@ -5,15 +5,17 @@ ...@@ -5,15 +5,17 @@
* Copyright (C) 2018 Marcus Folkesson <marcus.folkesson@gmail.com> * Copyright (C) 2018 Marcus Folkesson <marcus.folkesson@gmail.com>
*/ */
#include <linux/kernel.h> #include <linux/cleanup.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/slab.h> #include <linux/input.h>
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h>
#include <linux/slab.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/input.h> #include <linux/usb/input.h>
#include <linux/mutex.h>
#include <linux/input.h>
#define PXRC_VENDOR_ID 0x1781 #define PXRC_VENDOR_ID 0x1781
#define PXRC_PRODUCT_ID 0x0898 #define PXRC_PRODUCT_ID 0x0898
...@@ -81,33 +83,28 @@ static void pxrc_usb_irq(struct urb *urb) ...@@ -81,33 +83,28 @@ static void pxrc_usb_irq(struct urb *urb)
static int pxrc_open(struct input_dev *input) static int pxrc_open(struct input_dev *input)
{ {
struct pxrc *pxrc = input_get_drvdata(input); struct pxrc *pxrc = input_get_drvdata(input);
int retval; int error;
mutex_lock(&pxrc->pm_mutex); guard(mutex)(&pxrc->pm_mutex);
retval = usb_submit_urb(pxrc->urb, GFP_KERNEL); error = usb_submit_urb(pxrc->urb, GFP_KERNEL);
if (retval) { if (error) {
dev_err(&pxrc->intf->dev, dev_err(&pxrc->intf->dev,
"%s - usb_submit_urb failed, error: %d\n", "%s - usb_submit_urb failed, error: %d\n",
__func__, retval); __func__, error);
retval = -EIO; return -EIO;
goto out;
} }
pxrc->is_open = true; pxrc->is_open = true;
return 0;
out:
mutex_unlock(&pxrc->pm_mutex);
return retval;
} }
static void pxrc_close(struct input_dev *input) static void pxrc_close(struct input_dev *input)
{ {
struct pxrc *pxrc = input_get_drvdata(input); struct pxrc *pxrc = input_get_drvdata(input);
mutex_lock(&pxrc->pm_mutex); guard(mutex)(&pxrc->pm_mutex);
usb_kill_urb(pxrc->urb); usb_kill_urb(pxrc->urb);
pxrc->is_open = false; pxrc->is_open = false;
mutex_unlock(&pxrc->pm_mutex);
} }
static void pxrc_free_urb(void *_pxrc) static void pxrc_free_urb(void *_pxrc)
...@@ -208,10 +205,9 @@ static int pxrc_suspend(struct usb_interface *intf, pm_message_t message) ...@@ -208,10 +205,9 @@ static int pxrc_suspend(struct usb_interface *intf, pm_message_t message)
{ {
struct pxrc *pxrc = usb_get_intfdata(intf); struct pxrc *pxrc = usb_get_intfdata(intf);
mutex_lock(&pxrc->pm_mutex); guard(mutex)(&pxrc->pm_mutex);
if (pxrc->is_open) if (pxrc->is_open)
usb_kill_urb(pxrc->urb); usb_kill_urb(pxrc->urb);
mutex_unlock(&pxrc->pm_mutex);
return 0; return 0;
} }
...@@ -219,14 +215,12 @@ static int pxrc_suspend(struct usb_interface *intf, pm_message_t message) ...@@ -219,14 +215,12 @@ static int pxrc_suspend(struct usb_interface *intf, pm_message_t message)
static int pxrc_resume(struct usb_interface *intf) static int pxrc_resume(struct usb_interface *intf)
{ {
struct pxrc *pxrc = usb_get_intfdata(intf); struct pxrc *pxrc = usb_get_intfdata(intf);
int retval = 0;
mutex_lock(&pxrc->pm_mutex); guard(mutex)(&pxrc->pm_mutex);
if (pxrc->is_open && usb_submit_urb(pxrc->urb, GFP_KERNEL) < 0) if (pxrc->is_open && usb_submit_urb(pxrc->urb, GFP_KERNEL) < 0)
retval = -EIO; return -EIO;
mutex_unlock(&pxrc->pm_mutex); return 0;
return retval;
} }
static int pxrc_pre_reset(struct usb_interface *intf) static int pxrc_pre_reset(struct usb_interface *intf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment