Merge tag 'regmap-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

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

diff --git a/drivers/gpio/gpio-max730x.c b/drivers/gpio/gpio-max730x.c
index f4f4ed19bdc13c8211d1eb74244afab51088738f..8672755f95c915a2ae2977678c51e554f616ae3f 100644 (file)
--- a/drivers/gpio/gpio-max730x.c
+++ b/drivers/gpio/gpio-max730x.c
@@ -188,7 +188,7 @@ int __max730x_probe(struct max7301 *ts)
        ts->chip.set = max7301_set;
 
        ts->chip.ngpio = PIN_NUMBER;
-       ts->chip.can_sleep = 1;
+       ts->chip.can_sleep = true;
        ts->chip.dev = dev;
        ts->chip.owner = THIS_MODULE;
 
@@ -220,7 +220,6 @@ int __max730x_probe(struct max7301 *ts)
        return ret;
 
 exit_destroy:
-       dev_set_drvdata(dev, NULL);
        mutex_destroy(&ts->lock);
        return ret;
 }
@@ -234,8 +233,6 @@ int __max730x_remove(struct device *dev)
        if (ts == NULL)
                return -ENODEV;
 
-       dev_set_drvdata(dev, NULL);
-
        /* Power down the chip and disable IRQ output */
        ts->write(dev, 0x04, 0x00);