[media] solo6x10: reimplement SAA712x setup routine

[~andy/linux] / drivers / gpio / gpio-74x164.c

diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index 464be961f605a70ff7db3c9845627ebf1f0abfad..721607904d0a4837590f0a295e394c727a537f38 100644 (file)
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -137,7 +137,7 @@ static int gen_74x164_probe(struct spi_device *spi)
 
        mutex_init(&chip->lock);
 
-       dev_set_drvdata(&spi->dev, chip);
+       spi_set_drvdata(spi, chip);
 
        chip->spi = spi;
 
@@ -176,7 +176,7 @@ static int gen_74x164_probe(struct spi_device *spi)
        return ret;
 
 exit_destroy:
-       dev_set_drvdata(&spi->dev, NULL);
+       spi_set_drvdata(spi, NULL);
        mutex_destroy(&chip->lock);
        return ret;
 }
@@ -186,11 +186,11 @@ static int gen_74x164_remove(struct spi_device *spi)
        struct gen_74x164_chip *chip;
        int ret;
 
-       chip = dev_get_drvdata(&spi->dev);
+       chip = spi_get_drvdata(spi);
        if (chip == NULL)
                return -ENODEV;
 
-       dev_set_drvdata(&spi->dev, NULL);
+       spi_set_drvdata(spi, NULL);
 
        ret = gpiochip_remove(&chip->gpio_chip);
        if (!ret)