gpio: generic: factor into gpio_chip struct

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: arm@kernel.org
Cc: Alexander Shiyan <shc_work@mail.ru>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Olof Johansson <olof@lixom.net>
Cc: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: Rabin Vincent <rabin@rab.in>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com
Acked-by: Gregory Fong <gregory.0xf0@gmail.com>
Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c
index f9ac3f351753..cbbec838a9d1 100644
--- a/drivers/gpio/gpio-ge.c
+++ b/drivers/gpio/gpio-ge.c
@@ -24,7 +24,7 @@
 #include <linux/of_gpio.h>
 #include <linux/of_address.h>
 #include <linux/module.h>
-#include <linux/basic_mmio_gpio.h>
+#include <linux/gpio/driver.h>
 
 #define GEF_GPIO_DIRECT         0x00
 #define GEF_GPIO_IN             0x04
@@ -55,19 +55,19 @@ static int __init gef_gpio_probe(struct platform_device *pdev)
 {
         const struct of_device_id *of_id =
                 of_match_device(gef_gpio_ids, &pdev->dev);
-        struct bgpio_chip *bgc;
+        struct gpio_chip *gc;
         void __iomem *regs;
         int ret;
 
-        bgc = devm_kzalloc(&pdev->dev, sizeof(*bgc), GFP_KERNEL);
-        if (!bgc)
+        gc = devm_kzalloc(&pdev->dev, sizeof(*gc), GFP_KERNEL);
+        if (!gc)
                 return -ENOMEM;
 
         regs = of_iomap(pdev->dev.of_node, 0);
         if (!regs)
                 return -ENOMEM;
 
-        ret = bgpio_init(bgc, &pdev->dev, 4, regs + GEF_GPIO_IN,
+        ret = bgpio_init(gc, &pdev->dev, 4, regs + GEF_GPIO_IN,
                          regs + GEF_GPIO_OUT, NULL, NULL,
                          regs + GEF_GPIO_DIRECT, BGPIOF_BIG_ENDIAN_BYTE_ORDER);
         if (ret) {
@@ -76,20 +76,20 @@ static int __init gef_gpio_probe(struct platform_device *pdev)
         }
 
         /* Setup pointers to chip functions */
-        bgc->gc.label = devm_kstrdup(&pdev->dev, pdev->dev.of_node->full_name,
+        gc->label = devm_kstrdup(&pdev->dev, pdev->dev.of_node->full_name,
                                      GFP_KERNEL);
-        if (!bgc->gc.label) {
+        if (!gc->label) {
                 ret = -ENOMEM;
                 goto err0;
         }
 
-        bgc->gc.base = -1;
-        bgc->gc.ngpio = (u16)(uintptr_t)of_id->data;
-        bgc->gc.of_gpio_n_cells = 2;
-        bgc->gc.of_node = pdev->dev.of_node;
+        gc->base = -1;
+        gc->ngpio = (u16)(uintptr_t)of_id->data;
+        gc->of_gpio_n_cells = 2;
+        gc->of_node = pdev->dev.of_node;
 
         /* This function adds a memory mapped GPIO chip */
-        ret = gpiochip_add(&bgc->gc);
+        ret = gpiochip_add_data(gc, NULL);
         if (ret)
                 goto err0;