diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-15 13:03:00 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-18 12:27:03 -0400 |
commit | c5b68807c6563bf3882c94268ca09198d2e574ae (patch) | |
tree | ef902a4be8f67e0080b1600d337802ddc4351d3c | |
parent | f1f0b57db01d1045d163eeb05d5a4e7bd934561a (diff) |
uwb: Remove umc bus legacy suspend/resume support
There are currently no umc drivers implementing suspend/resume, so remove
the legacy suspend/resume support from the framework. If a umc driver ever
wants to implement suspend/resume they can use dev_pm_ops, which works out
of the box without any additional support necessary from the bus itself.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/uwb/umc-bus.c | 34 | ||||
-rw-r--r-- | include/linux/uwb/umc.h | 2 |
2 files changed, 0 insertions, 36 deletions
diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c index 88a290f57ea0..c8571405146d 100644 --- a/drivers/uwb/umc-bus.c +++ b/drivers/uwb/umc-bus.c | |||
@@ -163,38 +163,6 @@ static int umc_device_remove(struct device *dev) | |||
163 | return 0; | 163 | return 0; |
164 | } | 164 | } |
165 | 165 | ||
166 | static int umc_device_suspend(struct device *dev, pm_message_t state) | ||
167 | { | ||
168 | struct umc_dev *umc; | ||
169 | struct umc_driver *umc_driver; | ||
170 | int err = 0; | ||
171 | |||
172 | umc = to_umc_dev(dev); | ||
173 | |||
174 | if (dev->driver) { | ||
175 | umc_driver = to_umc_driver(dev->driver); | ||
176 | if (umc_driver->suspend) | ||
177 | err = umc_driver->suspend(umc, state); | ||
178 | } | ||
179 | return err; | ||
180 | } | ||
181 | |||
182 | static int umc_device_resume(struct device *dev) | ||
183 | { | ||
184 | struct umc_dev *umc; | ||
185 | struct umc_driver *umc_driver; | ||
186 | int err = 0; | ||
187 | |||
188 | umc = to_umc_dev(dev); | ||
189 | |||
190 | if (dev->driver) { | ||
191 | umc_driver = to_umc_driver(dev->driver); | ||
192 | if (umc_driver->resume) | ||
193 | err = umc_driver->resume(umc); | ||
194 | } | ||
195 | return err; | ||
196 | } | ||
197 | |||
198 | static ssize_t capability_id_show(struct device *dev, struct device_attribute *attr, char *buf) | 166 | static ssize_t capability_id_show(struct device *dev, struct device_attribute *attr, char *buf) |
199 | { | 167 | { |
200 | struct umc_dev *umc = to_umc_dev(dev); | 168 | struct umc_dev *umc = to_umc_dev(dev); |
@@ -223,8 +191,6 @@ struct bus_type umc_bus_type = { | |||
223 | .match = umc_bus_match, | 191 | .match = umc_bus_match, |
224 | .probe = umc_device_probe, | 192 | .probe = umc_device_probe, |
225 | .remove = umc_device_remove, | 193 | .remove = umc_device_remove, |
226 | .suspend = umc_device_suspend, | ||
227 | .resume = umc_device_resume, | ||
228 | .dev_groups = umc_dev_groups, | 194 | .dev_groups = umc_dev_groups, |
229 | }; | 195 | }; |
230 | EXPORT_SYMBOL_GPL(umc_bus_type); | 196 | EXPORT_SYMBOL_GPL(umc_bus_type); |
diff --git a/include/linux/uwb/umc.h b/include/linux/uwb/umc.h index ba82f03d8287..02112299a1d3 100644 --- a/include/linux/uwb/umc.h +++ b/include/linux/uwb/umc.h | |||
@@ -87,8 +87,6 @@ struct umc_driver { | |||
87 | 87 | ||
88 | int (*probe)(struct umc_dev *); | 88 | int (*probe)(struct umc_dev *); |
89 | void (*remove)(struct umc_dev *); | 89 | void (*remove)(struct umc_dev *); |
90 | int (*suspend)(struct umc_dev *, pm_message_t state); | ||
91 | int (*resume)(struct umc_dev *); | ||
92 | int (*pre_reset)(struct umc_dev *); | 90 | int (*pre_reset)(struct umc_dev *); |
93 | int (*post_reset)(struct umc_dev *); | 91 | int (*post_reset)(struct umc_dev *); |
94 | 92 | ||