Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[linux-2.6-block.git] / drivers / gpio / gpio-syscon.c

diff --git a/drivers/gpio/gpio-syscon.c b/drivers/gpio/gpio-syscon.c
index 7b25fdf64802339967ab541bb5ecd5bb876779d7..e5c5b62058863a60b36cf7aa38e0e865b29daafb 100644 (file)
--- a/drivers/gpio/gpio-syscon.c
+++ b/drivers/gpio/gpio-syscon.c
@@ -59,14 +59,9 @@ struct syscon_gpio_priv {
        u32                             dir_reg_offset;
 };
 
-static inline struct syscon_gpio_priv *to_syscon_gpio(struct gpio_chip *chip)
-{
-       return container_of(chip, struct syscon_gpio_priv, chip);
-}
-
 static int syscon_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
-       struct syscon_gpio_priv *priv = to_syscon_gpio(chip);
+       struct syscon_gpio_priv *priv = gpiochip_get_data(chip);
        unsigned int val, offs;
        int ret;
 
@@ -82,7 +77,7 @@ static int syscon_gpio_get(struct gpio_chip *chip, unsigned offset)
 
 static void syscon_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
 {
-       struct syscon_gpio_priv *priv = to_syscon_gpio(chip);
+       struct syscon_gpio_priv *priv = gpiochip_get_data(chip);
        unsigned int offs;
 
        offs = priv->dreg_offset + priv->data->dat_bit_offset + offset;
@@ -95,7 +90,7 @@ static void syscon_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
 
 static int syscon_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
 {
-       struct syscon_gpio_priv *priv = to_syscon_gpio(chip);
+       struct syscon_gpio_priv *priv = gpiochip_get_data(chip);
 
        if (priv->data->flags & GPIO_SYSCON_FEAT_DIR) {
                unsigned int offs;
@@ -113,7 +108,7 @@ static int syscon_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
 
 static int syscon_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int val)
 {
-       struct syscon_gpio_priv *priv = to_syscon_gpio(chip);
+       struct syscon_gpio_priv *priv = gpiochip_get_data(chip);
 
        if (priv->data->flags & GPIO_SYSCON_FEAT_DIR) {
                unsigned int offs;
@@ -144,7 +139,7 @@ static const struct syscon_gpio_data clps711x_mctrl_gpio = {
 
 static void keystone_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
 {
-       struct syscon_gpio_priv *priv = to_syscon_gpio(chip);
+       struct syscon_gpio_priv *priv = gpiochip_get_data(chip);
        unsigned int offs;
        int ret;
 
@@ -159,7 +154,7 @@ static void keystone_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
                        BIT(offs % SYSCON_REG_BITS) | KEYSTONE_LOCK_BIT,
                        BIT(offs % SYSCON_REG_BITS) | KEYSTONE_LOCK_BIT);
        if (ret < 0)
-               dev_err(chip->dev, "gpio write failed ret(%d)\n", ret);
+               dev_err(chip->parent, "gpio write failed ret(%d)\n", ret);
 }
 
 static const struct syscon_gpio_data keystone_dsp_gpio = {
@@ -228,7 +223,7 @@ static int syscon_gpio_probe(struct platform_device *pdev)
                priv->dir_reg_offset <<= 3;
        }
 
-       priv->chip.dev = dev;
+       priv->chip.parent = dev;
        priv->chip.owner = THIS_MODULE;
        priv->chip.label = dev_name(dev);
        priv->chip.base = -1;
@@ -243,7 +238,7 @@ static int syscon_gpio_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, priv);
 
-       return gpiochip_add(&priv->chip);
+       return gpiochip_add_data(&priv->chip, priv);
 }
 
 static int syscon_gpio_remove(struct platform_device *pdev)