Merge remote-tracking branch 'gpio/for-next'

[karo-tx-linux.git] / drivers / gpio / gpio-74x164.c

diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index 5d518d5db7a0ae4a084f3652cb2ac61067a3dbc6..1e04bf91328d5895a65799a85b6b874a09710233 100644 (file)
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -176,7 +176,6 @@ static int gen_74x164_probe(struct spi_device *spi)
        return ret;
 
 exit_destroy:
-       spi_set_drvdata(spi, NULL);
        mutex_destroy(&chip->lock);
        return ret;
 }
@@ -190,8 +189,6 @@ static int gen_74x164_remove(struct spi_device *spi)
        if (chip == NULL)
                return -ENODEV;
 
-       spi_set_drvdata(spi, NULL);
-
        ret = gpiochip_remove(&chip->gpio_chip);
        if (!ret)
                mutex_destroy(&chip->lock);
@@ -212,7 +209,7 @@ static struct spi_driver gen_74x164_driver = {
        .driver = {
                .name           = "74x164",
                .owner          = THIS_MODULE,
-               .of_match_table = of_match_ptr(gen_74x164_dt_ids),
+               .of_match_table = gen_74x164_dt_ids,
        },
        .probe          = gen_74x164_probe,
        .remove         = gen_74x164_remove,