mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
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>
This commit is contained in:
parent
166814d841
commit
11680af7c8
1 changed files with 6 additions and 11 deletions
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/gpio/driver.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/via-core.h>
|
||||
#include <linux/via-gpio.h>
|
||||
|
@ -83,9 +83,7 @@ struct viafb_gpio_cfg {
|
|||
static void via_gpio_set(struct gpio_chip *chip, unsigned int nr,
|
||||
int value)
|
||||
{
|
||||
struct viafb_gpio_cfg *cfg = container_of(chip,
|
||||
struct viafb_gpio_cfg,
|
||||
gpio_chip);
|
||||
struct viafb_gpio_cfg *cfg = gpiochip_get_data(chip);
|
||||
u8 reg;
|
||||
struct viafb_gpio *gpio;
|
||||
unsigned long flags;
|
||||
|
@ -115,9 +113,7 @@ static int via_gpio_dir_out(struct gpio_chip *chip, unsigned int nr,
|
|||
*/
|
||||
static int via_gpio_dir_input(struct gpio_chip *chip, unsigned int nr)
|
||||
{
|
||||
struct viafb_gpio_cfg *cfg = container_of(chip,
|
||||
struct viafb_gpio_cfg,
|
||||
gpio_chip);
|
||||
struct viafb_gpio_cfg *cfg = gpiochip_get_data(chip);
|
||||
struct viafb_gpio *gpio;
|
||||
unsigned long flags;
|
||||
|
||||
|
@ -131,9 +127,7 @@ static int via_gpio_dir_input(struct gpio_chip *chip, unsigned int nr)
|
|||
|
||||
static int via_gpio_get(struct gpio_chip *chip, unsigned int nr)
|
||||
{
|
||||
struct viafb_gpio_cfg *cfg = container_of(chip,
|
||||
struct viafb_gpio_cfg,
|
||||
gpio_chip);
|
||||
struct viafb_gpio_cfg *cfg = gpiochip_get_data(chip);
|
||||
u8 reg;
|
||||
struct viafb_gpio *gpio;
|
||||
unsigned long flags;
|
||||
|
@ -255,7 +249,8 @@ static int viafb_gpio_probe(struct platform_device *platdev)
|
|||
* Get registered.
|
||||
*/
|
||||
viafb_gpio_config.gpio_chip.base = -1; /* Dynamic */
|
||||
ret = gpiochip_add(&viafb_gpio_config.gpio_chip);
|
||||
ret = gpiochip_add_data(&viafb_gpio_config.gpio_chip,
|
||||
&viafb_gpio_config);
|
||||
if (ret) {
|
||||
printk(KERN_ERR "viafb: failed to add gpios (%d)\n", ret);
|
||||
viafb_gpio_config.gpio_chip.ngpio = 0;
|
||||
|
|
Loading…
Reference in a new issue