diff options
author | Daniel Mack <daniel@caiaq.de> | 2009-09-21 20:04:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:17:49 -0400 |
commit | dc791f8aeeeea4314beede83d6ee74e6af5f627b (patch) | |
tree | 15dff38707ba1991a0e822e43ec15a3923c13fef /drivers/hwmon | |
parent | 2cd9645e2f0d60ed12268fe1738e79c119e2fe5a (diff) |
lis3_spi: code cleanups
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/lis3lv02d_spi.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/hwmon/lis3lv02d_spi.c index 2bc84930a428..82ebca5a699c 100644 --- 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) | |||
66 | if (ret < 0) | 66 | if (ret < 0) |
67 | return ret; | 67 | return ret; |
68 | 68 | ||
69 | lis3_dev.bus_priv = spi; | 69 | lis3_dev.bus_priv = spi; |
70 | lis3_dev.init = lis3_spi_init; | 70 | lis3_dev.init = lis3_spi_init; |
71 | lis3_dev.read = lis3_spi_read; | 71 | lis3_dev.read = lis3_spi_read; |
72 | lis3_dev.write = lis3_spi_write; | 72 | lis3_dev.write = lis3_spi_write; |
73 | lis3_dev.irq = spi->irq; | 73 | lis3_dev.irq = spi->irq; |
74 | lis3_dev.ac = lis3lv02d_axis_normal; | 74 | lis3_dev.ac = lis3lv02d_axis_normal; |
75 | lis3_dev.pdata = spi->dev.platform_data; | 75 | lis3_dev.pdata = spi->dev.platform_data; |
76 | spi_set_drvdata(spi, &lis3_dev); | 76 | spi_set_drvdata(spi, &lis3_dev); |
77 | 77 | ||
78 | ret = lis3lv02d_init_device(&lis3_dev); | 78 | return lis3lv02d_init_device(&lis3_dev); |
79 | return ret; | ||
80 | } | 79 | } |
81 | 80 | ||
82 | static int __devexit lis302dl_spi_remove(struct spi_device *spi) | 81 | static int __devexit lis302dl_spi_remove(struct spi_device *spi) |