hwmon: w83627ehf updates

[safe/jmp/linux-2.6] / drivers / hwmon / lis3lv02d_spi.c

diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/hwmon/lis3lv02d_spi.c
index 2bc8493..82b1680 100644 (file)
--- a/drivers/hwmon/lis3lv02d_spi.c
+++ b/drivers/hwmon/lis3lv02d_spi.c
@@ -66,17 +66,16 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
        if (ret < 0)
                return ret;
 
-       lis3_dev.bus_priv = spi;
-       lis3_dev.init = lis3_spi_init;
-       lis3_dev.read = lis3_spi_read;
-       lis3_dev.write = lis3_spi_write;
-       lis3_dev.irq = spi->irq;
-       lis3_dev.ac = lis3lv02d_axis_normal;
-       lis3_dev.pdata = spi->dev.platform_data;
+       lis3_dev.bus_priv       = spi;
+       lis3_dev.init           = lis3_spi_init;
+       lis3_dev.read           = lis3_spi_read;
+       lis3_dev.write          = lis3_spi_write;
+       lis3_dev.irq            = spi->irq;
+       lis3_dev.ac             = lis3lv02d_axis_normal;
+       lis3_dev.pdata          = spi->dev.platform_data;
        spi_set_drvdata(spi, &lis3_dev);
 
-       ret = lis3lv02d_init_device(&lis3_dev);
-       return ret;
+       return lis3lv02d_init_device(&lis3_dev);
 }
 
 static int __devexit lis302dl_spi_remove(struct spi_device *spi)
@@ -84,7 +83,8 @@ static int __devexit lis302dl_spi_remove(struct spi_device *spi)
        struct lis3lv02d *lis3 = spi_get_drvdata(spi);
        lis3lv02d_joystick_disable();
        lis3lv02d_poweroff(lis3);
-       return 0;
+
+       return lis3lv02d_remove_fs(&lis3_dev);
 }
 
 #ifdef CONFIG_PM
@@ -140,4 +140,4 @@ module_exit(lis302dl_exit);
 MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
 MODULE_DESCRIPTION("lis3lv02d SPI glue layer");
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("spi:" DRV_NAME);