diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-02-03 17:25:34 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-02-04 16:46:24 -0500 |
commit | 600485edaef65d89f5c44ce62baa7cac961cd50d (patch) | |
tree | 9a651099ddf829c8cd0746f3b00b53744804df41 | |
parent | c50ae9470e542862f782e2d9c106270152bbf3ce (diff) |
ssb: unregister gpios before unloading ssb
This patch unregisters the gpio chip before ssb gets unloaded.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/ssb/driver_gpio.c | 12 | ||||
-rw-r--r-- | drivers/ssb/main.c | 9 | ||||
-rw-r--r-- | drivers/ssb/ssb_private.h | 5 |
3 files changed, 26 insertions, 0 deletions
diff --git a/drivers/ssb/driver_gpio.c b/drivers/ssb/driver_gpio.c index 97ac0a38e3d0..eb2753008ef0 100644 --- a/drivers/ssb/driver_gpio.c +++ b/drivers/ssb/driver_gpio.c | |||
@@ -174,3 +174,15 @@ int ssb_gpio_init(struct ssb_bus *bus) | |||
174 | 174 | ||
175 | return -1; | 175 | return -1; |
176 | } | 176 | } |
177 | |||
178 | int ssb_gpio_unregister(struct ssb_bus *bus) | ||
179 | { | ||
180 | if (ssb_chipco_available(&bus->chipco) || | ||
181 | ssb_extif_available(&bus->extif)) { | ||
182 | return gpiochip_remove(&bus->gpio); | ||
183 | } else { | ||
184 | SSB_WARN_ON(1); | ||
185 | } | ||
186 | |||
187 | return -1; | ||
188 | } | ||
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index c82c5c95fe85..7140c88738f4 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
@@ -443,6 +443,15 @@ static void ssb_devices_unregister(struct ssb_bus *bus) | |||
443 | 443 | ||
444 | void ssb_bus_unregister(struct ssb_bus *bus) | 444 | void ssb_bus_unregister(struct ssb_bus *bus) |
445 | { | 445 | { |
446 | int err; | ||
447 | |||
448 | err = ssb_gpio_unregister(bus); | ||
449 | if (err == -EBUSY) | ||
450 | ssb_dprintk(KERN_ERR PFX "Some GPIOs are still in use.\n"); | ||
451 | else if (err) | ||
452 | ssb_dprintk(KERN_ERR PFX | ||
453 | "Can not unregister GPIO driver: %i\n", err); | ||
454 | |||
446 | ssb_buses_lock(); | 455 | ssb_buses_lock(); |
447 | ssb_devices_unregister(bus); | 456 | ssb_devices_unregister(bus); |
448 | list_del(&bus->list); | 457 | list_del(&bus->list); |
diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h index 6c10b66c796c..da38305a2d22 100644 --- a/drivers/ssb/ssb_private.h +++ b/drivers/ssb/ssb_private.h | |||
@@ -252,11 +252,16 @@ static inline void ssb_extif_init(struct ssb_extif *extif) | |||
252 | 252 | ||
253 | #ifdef CONFIG_SSB_DRIVER_GPIO | 253 | #ifdef CONFIG_SSB_DRIVER_GPIO |
254 | extern int ssb_gpio_init(struct ssb_bus *bus); | 254 | extern int ssb_gpio_init(struct ssb_bus *bus); |
255 | extern int ssb_gpio_unregister(struct ssb_bus *bus); | ||
255 | #else /* CONFIG_SSB_DRIVER_GPIO */ | 256 | #else /* CONFIG_SSB_DRIVER_GPIO */ |
256 | static inline int ssb_gpio_init(struct ssb_bus *bus) | 257 | static inline int ssb_gpio_init(struct ssb_bus *bus) |
257 | { | 258 | { |
258 | return -ENOTSUPP; | 259 | return -ENOTSUPP; |
259 | } | 260 | } |
261 | static inline int ssb_gpio_unregister(struct ssb_bus *bus) | ||
262 | { | ||
263 | return 0; | ||
264 | } | ||
260 | #endif /* CONFIG_SSB_DRIVER_GPIO */ | 265 | #endif /* CONFIG_SSB_DRIVER_GPIO */ |
261 | 266 | ||
262 | #endif /* LINUX_SSB_PRIVATE_H_ */ | 267 | #endif /* LINUX_SSB_PRIVATE_H_ */ |