gpio: bt8xx: use lock guards

Reduce the code complexity by using automatic lock guards with the
spinlock.

Link: https://lore.kernel.org/r/20250310-gpiochip-set-conversion-v1-7-03798bb833eb@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/gpio-bt8xx.c b/drivers/gpio/gpio-bt8xx.c
index 7920cf2567988d1be49696a1153dfae036e3ece4..173da7bbfc98b7608d410190741e10319549bb9e 100644 (file)
--- a/drivers/gpio/gpio-bt8xx.c
+++ b/drivers/gpio/gpio-bt8xx.c
@@ -31,6 +31,7 @@
 
 */
 
+#include <linux/cleanup.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
@@ -69,10 +70,9 @@ MODULE_PARM_DESC(gpiobase, "The GPIO number base. -1 means dynamic, which is the
 static int bt8xxgpio_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
 {
        struct bt8xxgpio *bg = gpiochip_get_data(gpio);
-       unsigned long flags;
        u32 outen, data;
 
-       spin_lock_irqsave(&bg->lock, flags);
+       guard(spinlock_irqsave)(&bg->lock);
 
        data = bgread(BT848_GPIO_DATA);
        data &= ~(1 << nr);
@@ -82,20 +82,17 @@ static int bt8xxgpio_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
        outen &= ~(1 << nr);
        bgwrite(outen, BT848_GPIO_OUT_EN);
 
-       spin_unlock_irqrestore(&bg->lock, flags);
-
        return 0;
 }
 
 static int bt8xxgpio_gpio_get(struct gpio_chip *gpio, unsigned nr)
 {
        struct bt8xxgpio *bg = gpiochip_get_data(gpio);
-       unsigned long flags;
        u32 val;
 
-       spin_lock_irqsave(&bg->lock, flags);
+       guard(spinlock_irqsave)(&bg->lock);
+
        val = bgread(BT848_GPIO_DATA);
-       spin_unlock_irqrestore(&bg->lock, flags);
 
        return !!(val & (1 << nr));
 }
@@ -104,10 +101,9 @@ static int bt8xxgpio_gpio_direction_output(struct gpio_chip *gpio,
                                        unsigned nr, int val)
 {
        struct bt8xxgpio *bg = gpiochip_get_data(gpio);
-       unsigned long flags;
        u32 outen, data;
 
-       spin_lock_irqsave(&bg->lock, flags);
+       guard(spinlock_irqsave)(&bg->lock);
 
        outen = bgread(BT848_GPIO_OUT_EN);
        outen |= (1 << nr);
@@ -120,8 +116,6 @@ static int bt8xxgpio_gpio_direction_output(struct gpio_chip *gpio,
                data &= ~(1 << nr);
        bgwrite(data, BT848_GPIO_DATA);
 
-       spin_unlock_irqrestore(&bg->lock, flags);
-
        return 0;
 }
 
@@ -129,10 +123,9 @@ static void bt8xxgpio_gpio_set(struct gpio_chip *gpio,
                            unsigned nr, int val)
 {
        struct bt8xxgpio *bg = gpiochip_get_data(gpio);
-       unsigned long flags;
        u32 data;
 
-       spin_lock_irqsave(&bg->lock, flags);
+       guard(spinlock_irqsave)(&bg->lock);
 
        data = bgread(BT848_GPIO_DATA);
        if (val)
@@ -140,8 +133,6 @@ static void bt8xxgpio_gpio_set(struct gpio_chip *gpio,
        else
                data &= ~(1 << nr);
        bgwrite(data, BT848_GPIO_DATA);
-
-       spin_unlock_irqrestore(&bg->lock, flags);
 }
 
 static void bt8xxgpio_gpio_setup(struct bt8xxgpio *bg)
@@ -236,18 +227,15 @@ static void bt8xxgpio_remove(struct pci_dev *pdev)
 static int bt8xxgpio_suspend(struct pci_dev *pdev, pm_message_t state)
 {
        struct bt8xxgpio *bg = pci_get_drvdata(pdev);
-       unsigned long flags;
-
-       spin_lock_irqsave(&bg->lock, flags);
 
-       bg->saved_outen = bgread(BT848_GPIO_OUT_EN);
-       bg->saved_data = bgread(BT848_GPIO_DATA);
+       scoped_guard(spinlock_irqsave, &bg->lock) {
+               bg->saved_outen = bgread(BT848_GPIO_OUT_EN);
+               bg->saved_data = bgread(BT848_GPIO_DATA);
 
-       bgwrite(0, BT848_INT_MASK);
-       bgwrite(~0x0, BT848_INT_STAT);
-       bgwrite(0x0, BT848_GPIO_OUT_EN);
-
-       spin_unlock_irqrestore(&bg->lock, flags);
+               bgwrite(0, BT848_INT_MASK);
+               bgwrite(~0x0, BT848_INT_STAT);
+               bgwrite(0x0, BT848_GPIO_OUT_EN);
+       }
 
        pci_save_state(pdev);
        pci_disable_device(pdev);
@@ -259,7 +247,6 @@ static int bt8xxgpio_suspend(struct pci_dev *pdev, pm_message_t state)
 static int bt8xxgpio_resume(struct pci_dev *pdev)
 {
        struct bt8xxgpio *bg = pci_get_drvdata(pdev);
-       unsigned long flags;
        int err;
 
        pci_set_power_state(pdev, PCI_D0);
@@ -268,7 +255,7 @@ static int bt8xxgpio_resume(struct pci_dev *pdev)
                return err;
        pci_restore_state(pdev);
 
-       spin_lock_irqsave(&bg->lock, flags);
+       guard(spinlock_irqsave)(&bg->lock);
 
        bgwrite(0, BT848_INT_MASK);
        bgwrite(0, BT848_GPIO_DMA_CTL);
@@ -277,8 +264,6 @@ static int bt8xxgpio_resume(struct pci_dev *pdev)
        bgwrite(bg->saved_data & bg->saved_outen,
                BT848_GPIO_DATA);
 
-       spin_unlock_irqrestore(&bg->lock, flags);
-
        return 0;
 }
 #else