Message ID | 1449667938-2753-1-git-send-email-linus.walleij@linaro.org |
---|---|
State | New |
Headers | show |
Am Mittwoch, 9. Dezember 2015, 14:32:18 schrieb Linus Walleij: > This makes the driver use the data pointer added to the gpio_chip > to store a pointer to the state container instead of relying on > container_of(). > > Cc: Heiko Stuebner <heiko@sntech.de> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Looks nice, thanks for trying to keep gpio drivers clean Acked-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/pinctrl/pinctrl-rockchip.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-rockchip.c > b/drivers/pinctrl/pinctrl-rockchip.c index 2b88a40f61d3..56b8ce2a3df9 > 100644 > --- a/drivers/pinctrl/pinctrl-rockchip.c > +++ b/drivers/pinctrl/pinctrl-rockchip.c > @@ -224,11 +224,6 @@ static struct regmap_config rockchip_regmap_config = { > .reg_stride = 4, > }; > > -static inline struct rockchip_pin_bank *gc_to_pin_bank(struct gpio_chip > *gc) -{ > - return container_of(gc, struct rockchip_pin_bank, gpio_chip); > -} > - > static const inline struct rockchip_pin_group *pinctrl_name_to_group( > const struct rockchip_pinctrl *info, > const char *name) > @@ -939,7 +934,7 @@ static int _rockchip_pmx_gpio_set_direction(struct > gpio_chip *chip, unsigned long flags; > u32 data; > > - bank = gc_to_pin_bank(chip); > + bank = gpiochip_get_data(chip); > > ret = rockchip_set_mux(bank, pin, RK_FUNC_GPIO); > if (ret < 0) > @@ -1376,7 +1371,7 @@ static int rockchip_pinctrl_register(struct > platform_device *pdev, > > static void rockchip_gpio_set(struct gpio_chip *gc, unsigned offset, int > value) { > - struct rockchip_pin_bank *bank = gc_to_pin_bank(gc); > + struct rockchip_pin_bank *bank = gpiochip_get_data(gc); > void __iomem *reg = bank->reg_base + GPIO_SWPORT_DR; > unsigned long flags; > u32 data; > @@ -1400,7 +1395,7 @@ static void rockchip_gpio_set(struct gpio_chip *gc, > unsigned offset, int value) */ > static int rockchip_gpio_get(struct gpio_chip *gc, unsigned offset) > { > - struct rockchip_pin_bank *bank = gc_to_pin_bank(gc); > + struct rockchip_pin_bank *bank = gpiochip_get_data(gc); > u32 data; > > clk_enable(bank->clk); > @@ -1439,7 +1434,7 @@ static int rockchip_gpio_direction_output(struct > gpio_chip *gc, */ > static int rockchip_gpio_to_irq(struct gpio_chip *gc, unsigned offset) > { > - struct rockchip_pin_bank *bank = gc_to_pin_bank(gc); > + struct rockchip_pin_bank *bank = gpiochip_get_data(gc); > unsigned int virq; > > if (!bank->domain) > @@ -1758,7 +1753,7 @@ static int rockchip_gpiolib_register(struct > platform_device *pdev, gc->of_node = bank->of_node; > gc->label = bank->name; > > - ret = gpiochip_add(gc); > + ret = gpiochip_add_data(gc, bank); > if (ret) { > dev_err(&pdev->dev, "failed to register gpio_chip %s, error code: %d\n", > gc->label, ret); -- 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/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 2b88a40f61d3..56b8ce2a3df9 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -224,11 +224,6 @@ static struct regmap_config rockchip_regmap_config = { .reg_stride = 4, }; -static inline struct rockchip_pin_bank *gc_to_pin_bank(struct gpio_chip *gc) -{ - return container_of(gc, struct rockchip_pin_bank, gpio_chip); -} - static const inline struct rockchip_pin_group *pinctrl_name_to_group( const struct rockchip_pinctrl *info, const char *name) @@ -939,7 +934,7 @@ static int _rockchip_pmx_gpio_set_direction(struct gpio_chip *chip, unsigned long flags; u32 data; - bank = gc_to_pin_bank(chip); + bank = gpiochip_get_data(chip); ret = rockchip_set_mux(bank, pin, RK_FUNC_GPIO); if (ret < 0) @@ -1376,7 +1371,7 @@ static int rockchip_pinctrl_register(struct platform_device *pdev, static void rockchip_gpio_set(struct gpio_chip *gc, unsigned offset, int value) { - struct rockchip_pin_bank *bank = gc_to_pin_bank(gc); + struct rockchip_pin_bank *bank = gpiochip_get_data(gc); void __iomem *reg = bank->reg_base + GPIO_SWPORT_DR; unsigned long flags; u32 data; @@ -1400,7 +1395,7 @@ static void rockchip_gpio_set(struct gpio_chip *gc, unsigned offset, int value) */ static int rockchip_gpio_get(struct gpio_chip *gc, unsigned offset) { - struct rockchip_pin_bank *bank = gc_to_pin_bank(gc); + struct rockchip_pin_bank *bank = gpiochip_get_data(gc); u32 data; clk_enable(bank->clk); @@ -1439,7 +1434,7 @@ static int rockchip_gpio_direction_output(struct gpio_chip *gc, */ static int rockchip_gpio_to_irq(struct gpio_chip *gc, unsigned offset) { - struct rockchip_pin_bank *bank = gc_to_pin_bank(gc); + struct rockchip_pin_bank *bank = gpiochip_get_data(gc); unsigned int virq; if (!bank->domain) @@ -1758,7 +1753,7 @@ static int rockchip_gpiolib_register(struct platform_device *pdev, gc->of_node = bank->of_node; gc->label = bank->name; - ret = gpiochip_add(gc); + ret = gpiochip_add_data(gc, bank); if (ret) { dev_err(&pdev->dev, "failed to register gpio_chip %s, error code: %d\n", gc->label, ret);
This makes the driver use the data pointer added to the gpio_chip to store a pointer to the state container instead of relying on container_of(). Cc: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/pinctrl/pinctrl-rockchip.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)