On Wed, Dec 09, 2015 at 02:12:40PM +0100, Linus Walleij wrote: > The separate struct bgpio_chip has been a pain to handle, both > by being confusingly similar in name to struct gpio_chip and > for being contained inside a struct so that struct gpio_chip > is contained in a struct contained in a struct, making several > steps of dereferencing necessary. > > Make things simpler: include the fields directly into > <linux/gpio/driver.h>, #ifdef:ed for CONFIG_GENERIC_GPIO, and > get rid of the <linux/basic_mmio_gpio.h> altogether. Prefix > some of the member variables with bgpio_* and add proper > kerneldoc while we're at it. > > Modify all users to handle the change and use a struct > gpio_chip directly. And while we're at it: replace all > container_of() dereferencing by gpiochip_get_data() and > registering the gpio_chip with gpiochip_add_data(). > > Cc: a...@kernel.org > Cc: Lee Jones <lee.jo...@linaro.org> > Cc: Alexander Shiyan <shc_w...@mail.ru> > Cc: Shawn Guo <shawn...@kernel.org> > Cc: Sascha Hauer <ker...@pengutronix.de> > Cc: Tony Lindgren <t...@atomide.com> > Cc: Kukjin Kim <kg...@kernel.org> > Cc: Krzysztof Kozlowski <k.kozlow...@samsung.com> > Cc: Alexandre Courbot <gnu...@gmail.com> > Cc: Gregory Fong <gregory.0...@gmail.com> > Cc: Brian Norris <computersforpe...@gmail.com> > Cc: Florian Fainelli <f.faine...@gmail.com> > Cc: Liviu Dudau <liviu.du...@arm.com> > Cc: Sudeep Holla <sudeep.ho...@arm.com> > Cc: Lorenzo Pieralisi <lorenzo.pieral...@arm.com> > Cc: Nicolas Pitre <nicolas.pi...@linaro.org> > Cc: Olof Johansson <o...@lixom.net> > Cc: Vladimir Zapolskiy <vladimir_zapols...@mentor.com> > Cc: Rabin Vincent <ra...@rab.in> > Cc: linux-arm-ker...@lists.infradead.org > Cc: linux-omap@vger.kernel.org > Cc: linux-samsung-...@vger.kernel.org > Cc: bcm-kernel-feedback-l...@broadcom.com > Signed-off-by: Linus Walleij <linus.wall...@linaro.org> > --- > ARM SoC folks and Lee: it would be great if you could > ACK the few lines hitting arch/arm/* and drivers/mfd/* in this > so I can take it through the GPIO tree. > ---
[....] > drivers/mfd/vexpress-sysreg.c | 8 +- [....] > diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c > index 3e628df9280c..855c0204f09a 100644 > --- a/drivers/mfd/vexpress-sysreg.c > +++ b/drivers/mfd/vexpress-sysreg.c > @@ -11,7 +11,7 @@ > * Copyright (C) 2012 ARM Limited > */ > > -#include <linux/basic_mmio_gpio.h> > +#include <linux/gpio/driver.h> > #include <linux/err.h> > #include <linux/io.h> > #include <linux/mfd/core.h> > @@ -164,7 +164,7 @@ static int vexpress_sysreg_probe(struct platform_device > *pdev) > { > struct resource *mem; > void __iomem *base; > - struct bgpio_chip *mmc_gpio_chip; > + struct gpio_chip *mmc_gpio_chip; > int master; > u32 dt_hbi; > > @@ -201,8 +201,8 @@ static int vexpress_sysreg_probe(struct platform_device > *pdev) > return -ENOMEM; > bgpio_init(mmc_gpio_chip, &pdev->dev, 0x4, base + SYS_MCI, > NULL, NULL, NULL, NULL, 0); > - mmc_gpio_chip->gc.ngpio = 2; > - gpiochip_add(&mmc_gpio_chip->gc); > + mmc_gpio_chip->ngpio = 2; > + gpiochip_add(mmc_gpio_chip); > > return mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO, > vexpress_sysreg_cells, [....] > -- > 2.4.3 > For the drivers/mfd/vexpress-sysreg.c part: Acked-by: Liviu Dudau <liviu.du...@arm.com> -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯ -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html