Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

video: fbdev: via: use gpiochip data pointer

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: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

+6 -11
+6 -11
drivers/video/fbdev/via/via-gpio.c
··· 6 6 */ 7 7 8 8 #include <linux/spinlock.h> 9 - #include <linux/gpio.h> 9 + #include <linux/gpio/driver.h> 10 10 #include <linux/platform_device.h> 11 11 #include <linux/via-core.h> 12 12 #include <linux/via-gpio.h> ··· 83 83 static void via_gpio_set(struct gpio_chip *chip, unsigned int nr, 84 84 int value) 85 85 { 86 - struct viafb_gpio_cfg *cfg = container_of(chip, 87 - struct viafb_gpio_cfg, 88 - gpio_chip); 86 + struct viafb_gpio_cfg *cfg = gpiochip_get_data(chip); 89 87 u8 reg; 90 88 struct viafb_gpio *gpio; 91 89 unsigned long flags; ··· 113 115 */ 114 116 static int via_gpio_dir_input(struct gpio_chip *chip, unsigned int nr) 115 117 { 116 - struct viafb_gpio_cfg *cfg = container_of(chip, 117 - struct viafb_gpio_cfg, 118 - gpio_chip); 118 + struct viafb_gpio_cfg *cfg = gpiochip_get_data(chip); 119 119 struct viafb_gpio *gpio; 120 120 unsigned long flags; 121 121 ··· 127 131 128 132 static int via_gpio_get(struct gpio_chip *chip, unsigned int nr) 129 133 { 130 - struct viafb_gpio_cfg *cfg = container_of(chip, 131 - struct viafb_gpio_cfg, 132 - gpio_chip); 134 + struct viafb_gpio_cfg *cfg = gpiochip_get_data(chip); 133 135 u8 reg; 134 136 struct viafb_gpio *gpio; 135 137 unsigned long flags; ··· 249 255 * Get registered. 250 256 */ 251 257 viafb_gpio_config.gpio_chip.base = -1; /* Dynamic */ 252 - ret = gpiochip_add(&viafb_gpio_config.gpio_chip); 258 + ret = gpiochip_add_data(&viafb_gpio_config.gpio_chip, 259 + &viafb_gpio_config); 253 260 if (ret) { 254 261 printk(KERN_ERR "viafb: failed to add gpios (%d)\n", ret); 255 262 viafb_gpio_config.gpio_chip.ngpio = 0;