diff --git a/drivers/hid/hid-ft260.c b/drivers/hid/hid-ft260.c
index 53321c8d70fd..716b37cead7d 100644
--- a/drivers/hid/hid-ft260.c
+++ b/drivers/hid/hid-ft260.c
@@ -532,11 +532,11 @@ static struct ft260_chip *ft260_chip_get(struct usb_device *udev)
{
struct ft260_chip *chip;
- mutex_lock(&ft260_chip_list_lock);
+ guard(mutex)(&ft260_chip_list_lock);
list_for_each_entry(chip, &ft260_chip_list, list) {
if (chip->udev == udev) {
kref_get(&chip->kref);
- goto out;
+ return chip;
}
}
@@ -547,8 +547,6 @@ static struct ft260_chip *ft260_chip_get(struct usb_device *udev)
mutex_init(&chip->gpio_lock);
list_add_tail(&chip->list, &ft260_chip_list);
}
-out:
- mutex_unlock(&ft260_chip_list_lock);
return chip;
}
@@ -567,9 +565,8 @@ static void ft260_chip_put(struct ft260_chip *chip)
if (!chip)
return;
- mutex_lock(&ft260_chip_list_lock);
+ guard(mutex)(&ft260_chip_list_lock);
kref_put(&chip->kref, ft260_chip_release);
- mutex_unlock(&ft260_chip_list_lock);
}
static int ft260_hid_feature_report_get(struct hid_device *hdev,
@@ -1034,12 +1031,11 @@ static int ft260_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs,
struct ft260_device *dev = i2c_get_adapdata(adapter);
struct hid_device *hdev = dev->hdev;
- mutex_lock(&dev->lock);
+ guard(mutex)(&dev->lock);
ret = hid_hw_power(hdev, PM_HINT_FULLON);
if (ret < 0) {
hid_err(hdev, "failed to enter FULLON power mode: %d\n", ret);
- mutex_unlock(&dev->lock);
return ret;
}
@@ -1063,7 +1059,6 @@ static int ft260_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs,
ret = num;
i2c_exit:
hid_hw_power(hdev, PM_HINT_NORMAL);
- mutex_unlock(&dev->lock);
return ret;
}
@@ -1077,12 +1072,11 @@ static int ft260_smbus_xfer(struct i2c_adapter *adapter, u16 addr, u16 flags,
ft260_dbg("smbus size %d\n", size);
- mutex_lock(&dev->lock);
+ guard(mutex)(&dev->lock);
ret = hid_hw_power(hdev, PM_HINT_FULLON);
if (ret < 0) {
hid_err(hdev, "power management error: %d\n", ret);
- mutex_unlock(&dev->lock);
return ret;
}
@@ -1190,7 +1184,6 @@ static int ft260_smbus_xfer(struct i2c_adapter *adapter, u16 addr, u16 flags,
smbus_exit:
hid_hw_power(hdev, PM_HINT_NORMAL);
- mutex_unlock(&dev->lock);
return ret;
}
@@ -1317,21 +1310,20 @@ static int ft260_gpio_set(struct gpio_chip *gc, u32 offset, int value)
ft260_dbg("offset %d val %d\n", offset, value);
- mutex_lock(&dev->lock);
+ guard(mutex)(&dev->lock);
if (!(dev->gpio_en & BIT(offset))) {
hid_err(hdev, "%s: wrong pin function %d\n", __func__, offset);
- ret = -EINVAL;
- goto exit;
+ return -EINVAL;
}
- mutex_lock(&dev->chip->gpio_lock);
+ guard(mutex)(&dev->chip->gpio_lock);
ret = ft260_hid_feature_report_get(hdev, FT260_GPIO, (u8 *)&buf,
sizeof(buf));
if (unlikely(ret < 0)) {
hid_err(hdev, "%s: cannot get GPIO: %d\n", __func__, ret);
- goto unlock;
+ return ret;
}
rep.report = FT260_GPIO;@@ -1357,16 +1349,11 @@ static int ft260_gpio_set(struct gpio_chip *gc, u32 offset, int value)
ret = ft260_hid_feature_report_set(hdev, (u8 *)&rep, sizeof(rep));
if (unlikely(ret < 0)) {
hid_err(hdev, "%s: cannot set GPIO: %d\n", __func__, ret);
- goto unlock;
+ return ret;
}
dev->gpio = rep.gpio;
- ret = 0;
-unlock:
- mutex_unlock(&dev->chip->gpio_lock);
-exit:
- mutex_unlock(&dev->lock);
- return ret;
+ return 0;
}
/*@@ -1383,12 +1370,12 @@ static int ft260_gpio_pin_set(struct ft260_device *dev, u32 offset,
struct ft260_gpio_write_request_report *rep;
struct hid_device *hdev = dev->hdev;
- mutex_lock(&dev->chip->gpio_lock);
+ guard(mutex)(&dev->chip->gpio_lock);
ret = ft260_hid_feature_report_get(hdev, FT260_GPIO, (u8 *)&buf, sizeof(buf));
if (unlikely(ret < 0)) {
hid_err(hdev, "%s: cannot get GPIO: %d\n", __func__, ret);
- goto unlock;
+ return ret;
}
rep = (struct ft260_gpio_write_request_report *)&buf;@@ -1422,20 +1409,16 @@ static int ft260_gpio_pin_set(struct ft260_device *dev, u32 offset,
ret = ft260_hid_feature_report_set(hdev, (u8 *)rep, sizeof(*rep));
if (unlikely(ret < 0)) {
hid_err(hdev, "%s: cannot set GPIO: %d\n", __func__, ret);
- goto unlock;
+ return ret;
}
dev->gpio = rep->gpio;
- ret = 0;
-unlock:
- mutex_unlock(&dev->chip->gpio_lock);
- return ret;
+ return 0;
}
static int ft260_gpio_direction_set(struct gpio_chip *gc, u32 offset,
int value, int direction)
{
- int ret;
struct ft260_device *dev = gpiochip_get_data(gc);
struct hid_device *hdev = dev->hdev;
@@ -1446,17 +1429,14 @@ static int ft260_gpio_direction_set(struct gpio_chip *gc, u32 offset,
ft260_dbg("offset %d val %d direction %d\n", offset, value, direction);
- mutex_lock(&dev->lock);
+ guard(mutex)(&dev->lock);
if (!(dev->gpio_en & BIT(offset))) {
hid_err(hdev, "%s: wrong pin function %d\n", __func__, offset);
- ret = -EIO;
- } else {
- ret = ft260_gpio_pin_set(dev, offset, value, direction);
+ return -EIO;
}
- mutex_unlock(&dev->lock);
- return ret;
+ return ft260_gpio_pin_set(dev, offset, value, direction);
}
static int ft260_gpio_direction_output(struct gpio_chip *gc,@@ -1791,7 +1771,7 @@ static int ft260_i2c_clock_parse(const char *buf, unsigned int base, u16 *clock)
rep.name = conv(name); \
rep.report = id; \
rep.request = req; \
- mutex_lock(&dev->lock); \
+ guard(mutex)(&dev->lock); \
ret = ft260_hid_feature_report_set(hdev, (u8 *)&rep, \
sizeof(rep)); \
if (ret < 0) \
@@ -1800,7 +1780,6 @@ static int ft260_i2c_clock_parse(const char *buf, unsigned int base, u16 *clock)
func(hdev, req, name); \
ret = count; \
} \
- mutex_unlock(&dev->lock); \
} else { \
ret = -EINVAL; \
} \@@ -1975,7 +1954,7 @@ static int ft260_uart_add_port(struct ft260_device *port)
if (kfifo_alloc(&port->xmit_fifo, XMIT_FIFO_SIZE, GFP_KERNEL))
return -ENOMEM;
- mutex_lock(&ft260_uart_list_lock);
+ guard(mutex)(&ft260_uart_list_lock);
list_for_each_entry(dev, &ft260_uart_device_list, device_list) {
if (dev->index != index)
break;@@ -1985,7 +1964,6 @@ static int ft260_uart_add_port(struct ft260_device *port)
port->index = index;
/* Before the first gap, or at the end: the list stays sorted */
list_add_tail(&port->device_list, &dev->device_list);
- mutex_unlock(&ft260_uart_list_lock);
return ret;
}
@@ -2004,9 +1982,8 @@ static void ft260_uart_port_remove(struct ft260_device *port)
timer_shutdown_sync(&port->wakeup_timer);
cancel_work_sync(&port->wakeup_work);
- mutex_lock(&ft260_uart_list_lock);
- list_del(&port->device_list);
- mutex_unlock(&ft260_uart_list_lock);
+ scoped_guard(mutex, &ft260_uart_list_lock)
+ list_del(&port->device_list);
tty_port_tty_vhangup(&port->port);
@@ -2025,11 +2002,10 @@ static struct ft260_device *ft260_uart_port_get(int index)
if (index >= UART_COUNT_MAX)
return NULL;
- mutex_lock(&ft260_uart_list_lock);
+ guard(mutex)(&ft260_uart_list_lock);
port = ft260_dev_by_index(index);
if (port)
tty_port_get(&port->port);
- mutex_unlock(&ft260_uart_list_lock);
return port;
}
@@ -2224,7 +2200,7 @@ static int ft260_uart_change_speed(struct ft260_device *port,
req.data_bit, req.parity,
req.stop_bit, req.breaking);
- mutex_lock(&port->lock);
+ guard(mutex)(&port->lock);
ret = ft260_hid_feature_report_set(hdev, (u8 *)&req, sizeof(req));
if (ret < 0)
@@ -2232,8 +2208,6 @@ static int ft260_uart_change_speed(struct ft260_device *port,
else
ft260_gpio_en_update(hdev, FT260_SET_UART_MODE, req.flow_ctrl);
- mutex_unlock(&port->lock);
-
return ret;
}
@@ -2266,20 +2240,16 @@ static int ft260_uart_tiocmget(struct tty_struct *tty)
*/
int mask = FT260_GPIO_UART_MODE_4_SET;
- mutex_lock(&port->lock);
- if (port->removed) {
- mutex_unlock(&port->lock);
+ guard(mutex)(&port->lock);
+ if (port->removed)
return -ENODEV;
- }
if ((port->gpio_en & mask) != mask) {
ft260_dbg("Illegal gpio config %#02x != mask %#04x\n",
port->gpio_en, mask);
- mutex_unlock(&port->lock);
return -EINVAL;
}
gpios = ft260_gpio_get_all(&port->gc, FT260_GPIO_VALUE);
- mutex_unlock(&port->lock);
if (gpios < 0)
return gpios;
@@ -2301,26 +2271,22 @@ static int ft260_uart_tiocmset(struct tty_struct *tty,
struct hid_device *hdev = port->hdev;
int mask = FT260_GPIO_UART_MODE_4_SET;
- mutex_lock(&port->lock);
- if (port->removed) {
- mutex_unlock(&port->lock);
+ guard(mutex)(&port->lock);
+ if (port->removed)
return -ENODEV;
- }
if ((port->gpio_en & mask) != mask) {
ft260_dbg("Illegal gpio config %#02x != mask %#04x\n",
port->gpio_en, mask);
- mutex_unlock(&port->lock);
return -EINVAL;
}
- mutex_lock(&port->chip->gpio_lock);
+ guard(mutex)(&port->chip->gpio_lock);
ret = ft260_hid_feature_report_get(hdev, FT260_GPIO, (u8 *)&buf,
sizeof(buf));
if (unlikely(ret < 0)) {
hid_err(hdev, "%s: cannot get GPIO: %d\n", __func__, ret);
- ret = -EIO;
- goto unlock;
+ return -EIO;
}
rep.report = FT260_GPIO;@@ -2342,16 +2308,11 @@ static int ft260_uart_tiocmset(struct tty_struct *tty,
ret = ft260_hid_feature_report_set(hdev, (u8 *)&rep, sizeof(rep));
if (unlikely(ret < 0)) {
hid_err(hdev, "%s: cannot set GPIO: %d\n", __func__, ret);
- ret = -EIO;
- goto unlock;
+ return -EIO;
}
port->gpio = rep.gpio;
- ret = 0;
-unlock:
- mutex_unlock(&port->chip->gpio_lock);
- mutex_unlock(&port->lock);
- return ret;
+ return 0;
}
static int ft260_uart_install(struct tty_driver *driver, struct tty_struct *tty)@@ -2733,9 +2694,8 @@ static struct workqueue_struct *ft260_reset_wq;
static void ft260_chip_reset_done(struct ft260_chip *chip)
{
- mutex_lock(&ft260_chip_list_lock);
+ guard(mutex)(&ft260_chip_list_lock);
chip->reset_pending = false;
- mutex_unlock(&ft260_chip_list_lock);
}
static void ft260_reset_and_rebind(struct work_struct *ws)@@ -2845,10 +2805,10 @@ static int ft260_schedule_reset(struct usb_interface *usbif)
return -ENOMEM;
}
- mutex_lock(&ft260_chip_list_lock);
- pending = chip->reset_pending;
- chip->reset_pending = true;
- mutex_unlock(&ft260_chip_list_lock);
+ scoped_guard(mutex, &ft260_chip_list_lock) {
+ pending = chip->reset_pending;
+ chip->reset_pending = true;
+ }
if (pending) {
ft260_chip_put(chip);
kfree(rw);@@ -3092,9 +3052,8 @@ static void ft260_remove(struct hid_device *hdev)
* The hangup does not wait for a TIOCMGET or TIOCMSET
* that is running; they hold the lock while they use hdev.
*/
- mutex_lock(&dev->lock);
- dev->removed = true;
- mutex_unlock(&dev->lock);
+ scoped_guard(mutex, &dev->lock)
+ dev->removed = true;
if (dev->chip_mode & FT260_MODE_UART ||
dev->chip_mode == FT260_MODE_ALL ||
dev->chip_mode == FT260_MODE_BOTH)
--
2.43.0