[PATCH v2 06/12] pinctrl: nuvoton: Unmap GPIO bank registers on error in NPCM7xx and NPCM8xx
From: Lee Jones
Date: Thu Nov 19 2026 - 15:51:26 EST
npcm7xx_gpio_of() and npcm8xx_gpio_fw() map each GPIO bank's registers
via unmanaged fwnode_iomap() without unmapping them if a subsequent step
in the loop, pinctrl registration, or GPIO registration fails.
Register a devres action after each fwnode_iomap() call so the bank
mappings are released automatically on probe failure or device teardown.
Fixes: 3b588e43ee5c ("pinctrl: nuvoton: add NPCM7xx pinctrl and GPIO driver")
Fixes: acf4884a5717 ("pinctrl: nuvoton: add NPCM8XX pinctrl and GPIO driver")
Closes: https://sashiko.dev/#/bug/linux-cf83b9c0-f3a2-4dc8-95a0-af6fafb6d092
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Lee Jones <lee@xxxxxxxxxx>
---
v1 => v2:
- New patch, releasing fwnode_iomap() mappings via devres (Sashiko)
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 13 +++++++++++++
drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 13 +++++++++++++
2 files changed, 26 insertions(+)
diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
index 3a80948ac70f..3e763a097b91 100644
--- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
@@ -7,6 +7,7 @@
#include <linux/gpio/driver.h>
#include <linux/gpio/generic.h>
#include <linux/interrupt.h>
+#include <linux/io.h>
#include <linux/irq.h>
#include <linux/mfd/syscon.h>
#include <linux/module.h>
@@ -1821,6 +1822,13 @@ static const struct pinctrl_desc npcm7xx_pinctrl_desc = {
.owner = THIS_MODULE,
};
+static void npcm7xx_gpio_iounmap(void *data)
+{
+ struct npcm7xx_gpio *bank = data;
+
+ iounmap(bank->base);
+}
+
static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
{
struct gpio_generic_chip_config config;
@@ -1835,6 +1843,11 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
if (!pctrl->gpio_bank[id].base)
return -EINVAL;
+ ret = devm_add_action_or_reset(dev, npcm7xx_gpio_iounmap,
+ &pctrl->gpio_bank[id]);
+ if (ret)
+ return ret;
+
config = (struct gpio_generic_chip_config) {
.dev = dev,
.sz = 4,
diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
index 690ba8473bcc..f300c3cd924a 100644
--- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
@@ -7,6 +7,7 @@
#include <linux/gpio/driver.h>
#include <linux/gpio/generic.h>
#include <linux/interrupt.h>
+#include <linux/io.h>
#include <linux/irq.h>
#include <linux/mfd/syscon.h>
#include <linux/module.h>
@@ -2453,6 +2454,13 @@ static int npcmgpio_add_pin_ranges(struct gpio_chip *chip)
bank->chip.gc.ngpio);
}
+static void npcm8xx_gpio_iounmap(void *data)
+{
+ struct npcm8xx_gpio *bank = data;
+
+ iounmap(bank->base);
+}
+
static int npcm8xx_gpio_fw(struct npcm8xx_pinctrl *pctrl)
{
struct gpio_generic_chip_config config;
@@ -2467,6 +2475,11 @@ static int npcm8xx_gpio_fw(struct npcm8xx_pinctrl *pctrl)
if (!pctrl->gpio_bank[id].base)
return dev_err_probe(dev, -ENXIO, "fwnode_iomap id %d failed\n", id);
+ ret = devm_add_action_or_reset(dev, npcm8xx_gpio_iounmap,
+ &pctrl->gpio_bank[id]);
+ if (ret)
+ return ret;
+
config = (struct gpio_generic_chip_config) {
.dev = dev,
.sz = 4,
--
2.56.1.750.gf70dc682cf-goog