diff mbox

pinctrl: sh-pfc: Get rid of CONFIG_ARCH_SHMOBILE_LEGACY

Message ID 1440706043-3406-1-git-send-email-geert+renesas@glider.be (mailing list archive)
State Accepted
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Geert Uytterhoeven Aug. 27, 2015, 8:07 p.m. UTC 
Shmobile is all multiplatform these days, so get rid of the reference to
CONFIG_ARCH_SHMOBILE_LEGACY.

Move the legacy code to do the non-DT mapping between GPIOs and pins
inside the existing #ifdef CONFIG_SUPERH section.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
  - Against renesas-devel-20150826-v4.2-rc8,
  - This must not be applied to a branch that still has
    CONFIG_ARCH_SHMOBILE_LEGACY.

 drivers/pinctrl/sh-pfc/gpio.c | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

Comments

Linus Walleij Sept. 25, 2015, 4:14 p.m. UTC | #1 
On Thu, Aug 27, 2015 at 1:07 PM, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:

> Shmobile is all multiplatform these days, so get rid of the reference to
> CONFIG_ARCH_SHMOBILE_LEGACY.
>
> Move the legacy code to do the non-DT mapping between GPIOs and pins
> inside the existing #ifdef CONFIG_SUPERH section.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c
index 685b3c24627daf03..a917c62f07124b0b 100644
--- a/drivers/pinctrl/sh-pfc/gpio.c
+++ b/drivers/pinctrl/sh-pfc/gpio.c
@@ -341,7 +341,6 @@  int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 	struct sh_pfc_chip *chip;
 	phys_addr_t address;
 	unsigned int i;
-	int ret;
 
 	if (pfc->info->data_regs == NULL)
 		return 0;
@@ -379,29 +378,27 @@  int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 	if (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node)
 		return 0;
 
-	if (IS_ENABLED(CONFIG_SUPERH) ||
-	    IS_ENABLED(CONFIG_ARCH_SHMOBILE_LEGACY)) {
-		/*
-		 * Register the GPIO to pin mappings. As pins with GPIO ports
-		 * must come first in the ranges, skip the pins without GPIO
-		 * ports by stopping at the first range that contains such a
-		 * pin.
-		 */
-		for (i = 0; i < pfc->nr_ranges; ++i) {
-			const struct sh_pfc_pin_range *range = &pfc->ranges[i];
-
-			if (range->start >= pfc->nr_gpio_pins)
-				break;
-
-			ret = gpiochip_add_pin_range(&chip->gpio_chip,
-				dev_name(pfc->dev), range->start, range->start,
-				range->end - range->start + 1);
-			if (ret < 0)
-				return ret;
-		}
+#ifdef CONFIG_SUPERH
+	/*
+	 * Register the GPIO to pin mappings. As pins with GPIO ports
+	 * must come first in the ranges, skip the pins without GPIO
+	 * ports by stopping at the first range that contains such a
+	 * pin.
+	 */
+	for (i = 0; i < pfc->nr_ranges; ++i) {
+		const struct sh_pfc_pin_range *range = &pfc->ranges[i];
+		int ret;
+
+		if (range->start >= pfc->nr_gpio_pins)
+			break;
+
+		ret = gpiochip_add_pin_range(&chip->gpio_chip,
+			dev_name(pfc->dev), range->start, range->start,
+			range->end - range->start + 1);
+		if (ret < 0)
+			return ret;
 	}
 
-#ifdef CONFIG_SUPERH
 	/* Register the function GPIOs chip. */
 	if (pfc->info->nr_func_gpios == 0)
 		return 0;