Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

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

diff --git a/drivers/gpio/gpio-mc33880.c b/drivers/gpio/gpio-mc33880.c
index 6a8fdc26ae6a189f0870fa7fe33b527481ae3bc0..63a7a1bfb2d90a675473015c20591289a61465c1 100644 (file)
--- a/drivers/gpio/gpio-mc33880.c
+++ b/drivers/gpio/gpio-mc33880.c
@@ -101,13 +101,13 @@ static int mc33880_probe(struct spi_device *spi)
        if (ret < 0)
                return ret;
 
-       mc = kzalloc(sizeof(struct mc33880), GFP_KERNEL);
+       mc = devm_kzalloc(&spi->dev, sizeof(struct mc33880), GFP_KERNEL);
        if (!mc)
                return -ENOMEM;
 
        mutex_init(&mc->lock);
 
-       dev_set_drvdata(&spi->dev, mc);
+       spi_set_drvdata(spi, mc);
 
        mc->spi = spi;
 
@@ -130,7 +130,8 @@ static int mc33880_probe(struct spi_device *spi)
                ret = mc33880_write_config(mc);
 
        if (ret) {
-               printk(KERN_ERR "Failed writing to " DRIVER_NAME ": %d\n", ret);
+               dev_err(&spi->dev, "Failed writing to " DRIVER_NAME ": %d\n",
+                       ret);
                goto exit_destroy;
        }
 
@@ -141,9 +142,8 @@ static int mc33880_probe(struct spi_device *spi)
        return ret;
 
 exit_destroy:
-       dev_set_drvdata(&spi->dev, NULL);
+       spi_set_drvdata(spi, NULL);
        mutex_destroy(&mc->lock);
-       kfree(mc);
        return ret;
 }
 
@@ -152,17 +152,16 @@ static int mc33880_remove(struct spi_device *spi)
        struct mc33880 *mc;
        int ret;
 
-       mc = dev_get_drvdata(&spi->dev);
+       mc = spi_get_drvdata(spi);
        if (mc == NULL)
                return -ENODEV;
 
-       dev_set_drvdata(&spi->dev, NULL);
+       spi_set_drvdata(spi, NULL);
 
        ret = gpiochip_remove(&mc->chip);
-       if (!ret) {
+       if (!ret)
                mutex_destroy(&mc->lock);
-               kfree(mc);
-       } else
+       else
                dev_err(&spi->dev, "Failed to remove the GPIO controller: %d\n",
                        ret);