[v5,3/9] serial: sc16is7xx: refactor GPIO controller registration
Commit Message
From: Hugo Villeneuve <hvilleneuve@dimonoff.com>
In preparation for upcoming patch "fix regression with GPIO
configuration". To facilitate review and make code more modular.
Cc: <stable@vger.kernel.org> # 6.1.x
Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
Reviewed-by: Lech Perczak <lech.perczak@camlingroup.com>
Tested-by: Lech Perczak <lech.perczak@camlingroup.com>
---
drivers/tty/serial/sc16is7xx.c | 39 ++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 16 deletions(-)
Comments
Hugo Villeneuve schreef op 2023-06-01 18:31:
> From: Hugo Villeneuve <hvilleneuve@dimonoff.com>
>
> In preparation for upcoming patch "fix regression with GPIO
> configuration". To facilitate review and make code more modular.
>
> Cc: <stable@vger.kernel.org> # 6.1.x
> Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
> Reviewed-by: Lech Perczak <lech.perczak@camlingroup.com>
> Tested-by: Lech Perczak <lech.perczak@camlingroup.com>
> ---
> drivers/tty/serial/sc16is7xx.c | 39 ++++++++++++++++++++--------------
> 1 file changed, 23 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/tty/serial/sc16is7xx.c
> b/drivers/tty/serial/sc16is7xx.c
> index 0c903d44429c..279d7dcb1447 100644
> --- a/drivers/tty/serial/sc16is7xx.c
> +++ b/drivers/tty/serial/sc16is7xx.c
> @@ -1349,6 +1349,26 @@ static int
> sc16is7xx_gpio_direction_output(struct gpio_chip *chip,
>
> return 0;
> }
> +
> +static int sc16is7xx_setup_gpio_chip(struct device *dev)
Only one parameter, but...
> + ret = sc16is7xx_setup_gpio_chip(dev, mctrl_mask);
called with two.
Maarten
On Thu, 01 Jun 2023 19:28:01 +0200
m.brock@vanmierlo.com wrote:
> Hugo Villeneuve schreef op 2023-06-01 18:31:
> > From: Hugo Villeneuve <hvilleneuve@dimonoff.com>
> >
> > In preparation for upcoming patch "fix regression with GPIO
> > configuration". To facilitate review and make code more modular.
> >
> > Cc: <stable@vger.kernel.org> # 6.1.x
> > Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
> > Reviewed-by: Lech Perczak <lech.perczak@camlingroup.com>
> > Tested-by: Lech Perczak <lech.perczak@camlingroup.com>
> > ---
> > drivers/tty/serial/sc16is7xx.c | 39 ++++++++++++++++++++--------------
> > 1 file changed, 23 insertions(+), 16 deletions(-)
> >
> > diff --git a/drivers/tty/serial/sc16is7xx.c
> > b/drivers/tty/serial/sc16is7xx.c
> > index 0c903d44429c..279d7dcb1447 100644
> > --- a/drivers/tty/serial/sc16is7xx.c
> > +++ b/drivers/tty/serial/sc16is7xx.c
> > @@ -1349,6 +1349,26 @@ static int
> > sc16is7xx_gpio_direction_output(struct gpio_chip *chip,
> >
> > return 0;
> > }
> > +
> > +static int sc16is7xx_setup_gpio_chip(struct device *dev)
>
> Only one parameter, but...
>
> > + ret = sc16is7xx_setup_gpio_chip(dev, mctrl_mask);
>
> called with two.
Hi Maarten,
sorry about that, I will fix this for V6.
Somehow my automated compile script tested each patch separately, including this one, but the defconfig didn't enable the module sc6is7xx, so the error went unnoticed. I wrongly assumed that "make alldefconfig" enabled all modules, I will instead use "make allyesconfig".
Hugo.
@@ -1349,6 +1349,26 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip,
return 0;
}
+
+static int sc16is7xx_setup_gpio_chip(struct device *dev)
+{
+ struct sc16is7xx_port *s = dev_get_drvdata(dev);
+
+ if (!s->devtype->nr_gpio)
+ return 0;
+
+ s->gpio.owner = THIS_MODULE;
+ s->gpio.parent = dev;
+ s->gpio.label = dev_name(dev);
+ s->gpio.direction_input = sc16is7xx_gpio_direction_input;
+ s->gpio.get = sc16is7xx_gpio_get;
+ s->gpio.direction_output = sc16is7xx_gpio_direction_output;
+ s->gpio.set = sc16is7xx_gpio_set;
+ s->gpio.base = -1;
+ s->gpio.ngpio = s->devtype->nr_gpio;
+ s->gpio.can_sleep = 1;
+ return gpiochip_add_data(&s->gpio, s);
+}
#endif
static const struct serial_rs485 sc16is7xx_rs485_supported = {
@@ -1502,22 +1522,9 @@ static int sc16is7xx_probe(struct device *dev,
}
#ifdef CONFIG_GPIOLIB
- if (devtype->nr_gpio) {
- /* Setup GPIO cotroller */
- s->gpio.owner = THIS_MODULE;
- s->gpio.parent = dev;
- s->gpio.label = dev_name(dev);
- s->gpio.direction_input = sc16is7xx_gpio_direction_input;
- s->gpio.get = sc16is7xx_gpio_get;
- s->gpio.direction_output = sc16is7xx_gpio_direction_output;
- s->gpio.set = sc16is7xx_gpio_set;
- s->gpio.base = -1;
- s->gpio.ngpio = devtype->nr_gpio;
- s->gpio.can_sleep = 1;
- ret = gpiochip_add_data(&s->gpio, s);
- if (ret)
- goto out_thread;
- }
+ ret = sc16is7xx_setup_gpio_chip(dev, mctrl_mask);
+ if (ret)
+ goto out_thread;
#endif
/*