Commit 27524ff8 authored by Linus Walleij's avatar Linus Walleij Committed by Mauro Carvalho Chehab

[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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 7655a3ae
...@@ -606,8 +606,7 @@ static int cxd2820r_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) ...@@ -606,8 +606,7 @@ static int cxd2820r_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
static int cxd2820r_gpio_direction_output(struct gpio_chip *chip, unsigned nr, static int cxd2820r_gpio_direction_output(struct gpio_chip *chip, unsigned nr,
int val) int val)
{ {
struct cxd2820r_priv *priv = struct cxd2820r_priv *priv = gpiochip_get_data(chip);
container_of(chip, struct cxd2820r_priv, gpio_chip);
u8 gpio[GPIO_COUNT]; u8 gpio[GPIO_COUNT];
dev_dbg(&priv->i2c->dev, "%s: nr=%d val=%d\n", __func__, nr, val); dev_dbg(&priv->i2c->dev, "%s: nr=%d val=%d\n", __func__, nr, val);
...@@ -620,8 +619,7 @@ static int cxd2820r_gpio_direction_output(struct gpio_chip *chip, unsigned nr, ...@@ -620,8 +619,7 @@ static int cxd2820r_gpio_direction_output(struct gpio_chip *chip, unsigned nr,
static void cxd2820r_gpio_set(struct gpio_chip *chip, unsigned nr, int val) static void cxd2820r_gpio_set(struct gpio_chip *chip, unsigned nr, int val)
{ {
struct cxd2820r_priv *priv = struct cxd2820r_priv *priv = gpiochip_get_data(chip);
container_of(chip, struct cxd2820r_priv, gpio_chip);
u8 gpio[GPIO_COUNT]; u8 gpio[GPIO_COUNT];
dev_dbg(&priv->i2c->dev, "%s: nr=%d val=%d\n", __func__, nr, val); dev_dbg(&priv->i2c->dev, "%s: nr=%d val=%d\n", __func__, nr, val);
...@@ -636,8 +634,7 @@ static void cxd2820r_gpio_set(struct gpio_chip *chip, unsigned nr, int val) ...@@ -636,8 +634,7 @@ static void cxd2820r_gpio_set(struct gpio_chip *chip, unsigned nr, int val)
static int cxd2820r_gpio_get(struct gpio_chip *chip, unsigned nr) static int cxd2820r_gpio_get(struct gpio_chip *chip, unsigned nr)
{ {
struct cxd2820r_priv *priv = struct cxd2820r_priv *priv = gpiochip_get_data(chip);
container_of(chip, struct cxd2820r_priv, gpio_chip);
dev_dbg(&priv->i2c->dev, "%s: nr=%d\n", __func__, nr); dev_dbg(&priv->i2c->dev, "%s: nr=%d\n", __func__, nr);
...@@ -731,7 +728,7 @@ struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg, ...@@ -731,7 +728,7 @@ struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,
priv->gpio_chip.base = -1; /* dynamic allocation */ priv->gpio_chip.base = -1; /* dynamic allocation */
priv->gpio_chip.ngpio = GPIO_COUNT; priv->gpio_chip.ngpio = GPIO_COUNT;
priv->gpio_chip.can_sleep = 1; priv->gpio_chip.can_sleep = 1;
ret = gpiochip_add(&priv->gpio_chip); ret = gpiochip_add_data(&priv->gpio_chip, priv);
if (ret) if (ret)
goto error; goto error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment