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

[karo-tx-linux.git] / drivers / mfd / da9052-spi.c

diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c
index b5de8a6856c0de07f29c10dbeaa4de67c0ac4617..b9ea1b27db642d452b39ceaf1a5a96fa9657804c 100644 (file)
--- a/drivers/mfd/da9052-spi.c
+++ b/drivers/mfd/da9052-spi.c
@@ -56,11 +56,7 @@ static int da9052_spi_probe(struct spi_device *spi)
                return ret;
        }
 
-       ret = da9052_device_init(da9052, id->driver_data);
-       if (ret != 0)
-               return ret;
-
-       return 0;
+       return da9052_device_init(da9052, id->driver_data);
 }
 
 static int da9052_spi_remove(struct spi_device *spi)
@@ -86,7 +82,6 @@ static struct spi_driver da9052_spi_driver = {
        .id_table = da9052_spi_id,
        .driver = {
                .name = "da9052",
-               .owner = THIS_MODULE,
        },
 };