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

[media] : cxd2830r: 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: Antti Palosaari <crope@iki.fi>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

authored by

Linus Walleij and committed by
Mauro Carvalho Chehab
27524ff8 7655a3ae

+4 -7
+4 -7
drivers/media/dvb-frontends/cxd2820r_core.c
··· 606 606 static int cxd2820r_gpio_direction_output(struct gpio_chip *chip, unsigned nr, 607 607 int val) 608 608 { 609 - struct cxd2820r_priv *priv = 610 - container_of(chip, struct cxd2820r_priv, gpio_chip); 609 + struct cxd2820r_priv *priv = gpiochip_get_data(chip); 611 610 u8 gpio[GPIO_COUNT]; 612 611 613 612 dev_dbg(&priv->i2c->dev, "%s: nr=%d val=%d\n", __func__, nr, val); ··· 619 620 620 621 static void cxd2820r_gpio_set(struct gpio_chip *chip, unsigned nr, int val) 621 622 { 622 - struct cxd2820r_priv *priv = 623 - container_of(chip, struct cxd2820r_priv, gpio_chip); 623 + struct cxd2820r_priv *priv = gpiochip_get_data(chip); 624 624 u8 gpio[GPIO_COUNT]; 625 625 626 626 dev_dbg(&priv->i2c->dev, "%s: nr=%d val=%d\n", __func__, nr, val); ··· 634 636 635 637 static int cxd2820r_gpio_get(struct gpio_chip *chip, unsigned nr) 636 638 { 637 - struct cxd2820r_priv *priv = 638 - container_of(chip, struct cxd2820r_priv, gpio_chip); 639 + struct cxd2820r_priv *priv = gpiochip_get_data(chip); 639 640 640 641 dev_dbg(&priv->i2c->dev, "%s: nr=%d\n", __func__, nr); 641 642 ··· 728 731 priv->gpio_chip.base = -1; /* dynamic allocation */ 729 732 priv->gpio_chip.ngpio = GPIO_COUNT; 730 733 priv->gpio_chip.can_sleep = 1; 731 - ret = gpiochip_add(&priv->gpio_chip); 734 + ret = gpiochip_add_data(&priv->gpio_chip, priv); 732 735 if (ret) 733 736 goto error; 734 737