i2c: mux: gpio: don't fiddle with GPIOLIB internals

Use the relevant API functions to retrieve the address of the
underlying struct device instead of accessing GPIOLIB private structures
manually.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Acked-by: Peter Rosin <peda@axentia.se>
Acked-by: Wolfram Sang <wsa@kernel.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 5d5cbe0130cdf99de1917d5c013b8894c622a727..48a872a8196b840d18d746996a6182ee931c935c 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -14,8 +14,7 @@
 #include <linux/slab.h>
 #include <linux/bits.h>
 #include <linux/gpio/consumer.h>
-/* FIXME: stop poking around inside gpiolib */
-#include "../../gpio/gpiolib.h"
+#include <linux/gpio/driver.h>
 
 struct gpiomux {
        struct i2c_mux_gpio_platform_data data;
@@ -176,7 +175,8 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev)
        }
 
        for (i = 0; i < ngpios; i++) {
-               struct device *gpio_dev;
+               struct gpio_device *gdev;
+               struct device *dev;
                struct gpio_desc *gpiod;
                enum gpiod_flags flag;
 
@@ -195,9 +195,9 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev)
                if (!muxc->mux_locked)
                        continue;
 
-               /* FIXME: find a proper way to access the GPIO device */
-               gpio_dev = &gpiod->gdev->dev;
-               muxc->mux_locked = i2c_root_adapter(gpio_dev) == root;
+               gdev = gpiod_to_gpio_device(gpiod);
+               dev = gpio_device_to_device(gdev);
+               muxc->mux_locked = i2c_root_adapter(dev) == root;
        }
 
        if (muxc->mux_locked)