diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-20 16:27:56 -0500 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2011-03-15 01:36:25 -0400 |
commit | 4e9be650597bffec5885a8c1abad1e4ffb0bcca3 (patch) | |
tree | e85ffd868d83a26f45d3f1b1a1d5b486d5bb5e6f | |
parent | 177f3b920cf6d1ab6d97f0978f866a8a711918e6 (diff) |
hwmon: (lis3lv02d) Convert SPI to dev_pm_ops
There is a move to deprecate bus-specific PM operations and move to
using dev_pm_ops instead in order to reduce the amount of boilerplate
code in buses and facilitiate updates to the PM core. Do this move for
the lis3lv02d SPI driver.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
-rw-r--r-- | drivers/hwmon/lis3lv02d_spi.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/hwmon/lis3lv02d_spi.c index 2549de1de4e2..c1f8a8fbf694 100644 --- a/drivers/hwmon/lis3lv02d_spi.c +++ b/drivers/hwmon/lis3lv02d_spi.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
17 | #include <linux/workqueue.h> | 17 | #include <linux/workqueue.h> |
18 | #include <linux/spi/spi.h> | 18 | #include <linux/spi/spi.h> |
19 | #include <linux/pm.h> | ||
19 | 20 | ||
20 | #include "lis3lv02d.h" | 21 | #include "lis3lv02d.h" |
21 | 22 | ||
@@ -88,9 +89,10 @@ static int __devexit lis302dl_spi_remove(struct spi_device *spi) | |||
88 | return lis3lv02d_remove_fs(&lis3_dev); | 89 | return lis3lv02d_remove_fs(&lis3_dev); |
89 | } | 90 | } |
90 | 91 | ||
91 | #ifdef CONFIG_PM | 92 | #ifdef CONFIG_PM_SLEEP |
92 | static int lis3lv02d_spi_suspend(struct spi_device *spi, pm_message_t mesg) | 93 | static int lis3lv02d_spi_suspend(struct device *dev) |
93 | { | 94 | { |
95 | struct spi_device *spi = to_spi_device(dev); | ||
94 | struct lis3lv02d *lis3 = spi_get_drvdata(spi); | 96 | struct lis3lv02d *lis3 = spi_get_drvdata(spi); |
95 | 97 | ||
96 | if (!lis3->pdata || !lis3->pdata->wakeup_flags) | 98 | if (!lis3->pdata || !lis3->pdata->wakeup_flags) |
@@ -99,8 +101,9 @@ static int lis3lv02d_spi_suspend(struct spi_device *spi, pm_message_t mesg) | |||
99 | return 0; | 101 | return 0; |
100 | } | 102 | } |
101 | 103 | ||
102 | static int lis3lv02d_spi_resume(struct spi_device *spi) | 104 | static int lis3lv02d_spi_resume(struct device *dev) |
103 | { | 105 | { |
106 | struct spi_device *spi = to_spi_device(dev); | ||
104 | struct lis3lv02d *lis3 = spi_get_drvdata(spi); | 107 | struct lis3lv02d *lis3 = spi_get_drvdata(spi); |
105 | 108 | ||
106 | if (!lis3->pdata || !lis3->pdata->wakeup_flags) | 109 | if (!lis3->pdata || !lis3->pdata->wakeup_flags) |
@@ -108,21 +111,19 @@ static int lis3lv02d_spi_resume(struct spi_device *spi) | |||
108 | 111 | ||
109 | return 0; | 112 | return 0; |
110 | } | 113 | } |
111 | |||
112 | #else | ||
113 | #define lis3lv02d_spi_suspend NULL | ||
114 | #define lis3lv02d_spi_resume NULL | ||
115 | #endif | 114 | #endif |
116 | 115 | ||
116 | static SIMPLE_DEV_PM_OPS(lis3lv02d_spi_pm, lis3lv02d_spi_suspend, | ||
117 | lis3lv02d_spi_resume); | ||
118 | |||
117 | static struct spi_driver lis302dl_spi_driver = { | 119 | static struct spi_driver lis302dl_spi_driver = { |
118 | .driver = { | 120 | .driver = { |
119 | .name = DRV_NAME, | 121 | .name = DRV_NAME, |
120 | .owner = THIS_MODULE, | 122 | .owner = THIS_MODULE, |
123 | .pm = &lis3lv02d_spi_pm, | ||
121 | }, | 124 | }, |
122 | .probe = lis302dl_spi_probe, | 125 | .probe = lis302dl_spi_probe, |
123 | .remove = __devexit_p(lis302dl_spi_remove), | 126 | .remove = __devexit_p(lis302dl_spi_remove), |
124 | .suspend = lis3lv02d_spi_suspend, | ||
125 | .resume = lis3lv02d_spi_resume, | ||
126 | }; | 127 | }; |
127 | 128 | ||
128 | static int __init lis302dl_init(void) | 129 | static int __init lis302dl_init(void) |