[15/18] gpio: sta2x11: Inline regs macro

Message ID	20180629063544.3826-15-linus.walleij@linaro.org
State	Accepted
Commit	aadf77c88d2f8f1ffcf75c1e985da1a5cb66c36a
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Linus Walleij <linus.walleij@linaro.org> To: linux-gpio@vger.kernel.org Cc: Linus Walleij <linus.walleij@linaro.org>, Alessandro Rubini <rubini@gnudd.com>, Bartosz Golaszewski <brgl@bgdev.pl> Subject: [PATCH 15/18] gpio: sta2x11: Inline regs macro Date: Fri, 29 Jun 2018 08:35:41 +0200 Message-Id: <20180629063544.3826-15-linus.walleij@linaro.org> In-Reply-To: <20180629063544.3826-1-linus.walleij@linaro.org> References: <20180629063544.3826-1-linus.walleij@linaro.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk
Series	[01/18] gpio: rc5t583: Include the right header \| expand [01/18] gpio: rc5t583: Include the right header [02/18] gpio: rcar: Include the right header [03/18] gpio: rdc321x: Include the right header [04/18] gpio: sa1100: Include the right header [05/18] gpio: sch: Include the right header [06/18] gpio: sch: Implement .get_direction() [07/18] gpio: sch311x: Include the right header [08/18] gpio: sch311x: Implement .get_direction() [09/18] gpio: sch311x: Use RMW to change direction [10/18] gpio: sch311x: Implement open drain support [11/18] gpio: sch311x: Replace unsigned char with u8 [12/18] gpio: spear-spics: Include the right header [13/18] gpio: sta2x11: Include the right header [14/18] gpio: sta2x11: Use BIT() macro [15/18] gpio: sta2x11: Inline regs macro [16/18] gpio: stmpe: Include the right header [17/18] gpio: stp-xway: Include the right header [18/18] gpio: syscon: Include the right header

Message ID

20180629063544.3826-15-linus.walleij@linaro.org

State

Accepted

Commit

aadf77c88d2f8f1ffcf75c1e985da1a5cb66c36a

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as
	permitted sender) client-ip=209.132.180.67; 
From: Linus Walleij <linus.walleij@linaro.org>
To: linux-gpio@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>,
	Alessandro Rubini <rubini@gnudd.com>, Bartosz Golaszewski <brgl@bgdev.pl>
Subject: [PATCH 15/18] gpio: sta2x11: Inline regs macro
Date: Fri, 29 Jun 2018 08:35:41 +0200
Message-Id: <20180629063544.3826-15-linus.walleij@linaro.org>
In-Reply-To: <20180629063544.3826-1-linus.walleij@linaro.org>
References: <20180629063544.3826-1-linus.walleij@linaro.org>
Sender: linux-gpio-owner@vger.kernel.org
Precedence: bulk

Series

[01/18] gpio: rc5t583: Include the right header | expand

Commit Message

Linus Walleij June 29, 2018, 6:35 a.m. UTC

I don't like the __namespace and this is simple enough to just
inline at all sites.

Cc: Alessandro Rubini <rubini@gnudd.com>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

---
 drivers/gpio/gpio-sta2x11.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

-- 
2.17.0

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Alessandro Rubini June 30, 2018, 4 a.m. UTC | #1

> I don't like the __namespace and this is simple enough to just

> inline at all sites.


Ah. Personal likes/dislikes bring to endless back and forth of code style.

Acked-by: Alessandro Rubini <rubini@gnudd.com>


--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Linus Walleij July 2, 2018, 1:59 p.m. UTC | #2

On Sat, Jun 30, 2018 at 6:00 AM Alessandro Rubini <rubini@gnudd.com> wrote:
>

> > I don't like the __namespace and this is simple enough to just

> > inline at all sites.

>

> Ah. Personal likes/dislikes bring to endless back and forth of code style.


True, sorry about that :(

My personal problem with __ is that the meaning it is
context-dependent and apparently often "obvious" to the
author and quite often not obvious to me.

> Acked-by: Alessandro Rubini <rubini@gnudd.com>


Nice to see you around Alessandro!

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

diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c
index 4af90968e838..2283c869ad5d 100644
--- a/drivers/gpio/gpio-sta2x11.c
+++ b/drivers/gpio/gpio-sta2x11.c
@@ -59,11 +59,6 @@  struct gsta_gpio {
 	unsigned			irq_type[GSTA_NR_GPIO];
 };
 
-static inline struct gsta_regs __iomem *__regs(struct gsta_gpio *chip, int nr)
-{
-	return chip->regs[nr / GSTA_GPIO_PER_BLOCK];
-}
-
 /*
  * gpio methods
  */
@@ -71,7 +66,7 @@  static inline struct gsta_regs __iomem *__regs(struct gsta_gpio *chip, int nr)
 static void gsta_gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
 {
 	struct gsta_gpio *chip = gpiochip_get_data(gpio);
-	struct gsta_regs __iomem *regs = __regs(chip, nr);
+	struct gsta_regs __iomem *regs = chip->regs[nr / GSTA_GPIO_PER_BLOCK];
 	u32 bit = BIT(nr % GSTA_GPIO_PER_BLOCK);
 
 	if (val)
@@ -83,7 +78,7 @@  static void gsta_gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
 static int gsta_gpio_get(struct gpio_chip *gpio, unsigned nr)
 {
 	struct gsta_gpio *chip = gpiochip_get_data(gpio);
-	struct gsta_regs __iomem *regs = __regs(chip, nr);
+	struct gsta_regs __iomem *regs = chip->regs[nr / GSTA_GPIO_PER_BLOCK];
 	u32 bit = BIT(nr % GSTA_GPIO_PER_BLOCK);
 
 	return !!(readl(&regs->dat) & bit);
@@ -93,7 +88,7 @@  static int gsta_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
 				      int val)
 {
 	struct gsta_gpio *chip = gpiochip_get_data(gpio);
-	struct gsta_regs __iomem *regs = __regs(chip, nr);
+	struct gsta_regs __iomem *regs = chip->regs[nr / GSTA_GPIO_PER_BLOCK];
 	u32 bit = BIT(nr % GSTA_GPIO_PER_BLOCK);
 
 	writel(bit, &regs->dirs);
@@ -108,7 +103,7 @@  static int gsta_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
 static int gsta_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
 {
 	struct gsta_gpio *chip = gpiochip_get_data(gpio);
-	struct gsta_regs __iomem *regs = __regs(chip, nr);
+	struct gsta_regs __iomem *regs = chip->regs[nr / GSTA_GPIO_PER_BLOCK];
 	u32 bit = BIT(nr % GSTA_GPIO_PER_BLOCK);
 
 	writel(bit, &regs->dirc);
@@ -161,7 +156,7 @@  static void gsta_gpio_setup(struct gsta_gpio *chip) /* called from probe */
  */
 static void gsta_set_config(struct gsta_gpio *chip, int nr, unsigned cfg)
 {
-	struct gsta_regs __iomem *regs = __regs(chip, nr);
+	struct gsta_regs __iomem *regs = chip->regs[nr / GSTA_GPIO_PER_BLOCK];
 	unsigned long flags;
 	u32 bit = BIT(nr % GSTA_GPIO_PER_BLOCK);
 	u32 val;
@@ -230,7 +225,7 @@  static void gsta_irq_disable(struct irq_data *data)
 	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
 	struct gsta_gpio *chip = gc->private;
 	int nr = data->irq - chip->irq_base;
-	struct gsta_regs __iomem *regs = __regs(chip, nr);
+	struct gsta_regs __iomem *regs = chip->regs[nr / GSTA_GPIO_PER_BLOCK];
 	u32 bit = BIT(nr % GSTA_GPIO_PER_BLOCK);
 	u32 val;
 	unsigned long flags;
@@ -253,7 +248,7 @@  static void gsta_irq_enable(struct irq_data *data)
 	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
 	struct gsta_gpio *chip = gc->private;
 	int nr = data->irq - chip->irq_base;
-	struct gsta_regs __iomem *regs = __regs(chip, nr);
+	struct gsta_regs __iomem *regs = chip->regs[nr / GSTA_GPIO_PER_BLOCK];
 	u32 bit = BIT(nr % GSTA_GPIO_PER_BLOCK);
 	u32 val;
 	int type;

[15/18] gpio: sta2x11: Inline regs macro

Commit Message

Comments

Patch