This patch cleanups registered devices on remove.
Signed-off-by: Marc Dietrich <[email protected]>
---
drivers/staging/nvec/nvec_kbd.c | 9 +++++++++
drivers/staging/nvec/nvec_power.c | 16 ++++++++++++++++
drivers/staging/nvec/nvec_ps2.c | 8 ++++++++
3 files changed, 33 insertions(+)
diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c
index d1dd10e..e893b9c 100644
--- a/drivers/staging/nvec/nvec_kbd.c
+++ b/drivers/staging/nvec/nvec_kbd.c
@@ -158,8 +158,17 @@ fail:
return err;
}
+static int __devexit nvec_kbd_remove(struct platform_device *pdev)
+{
+ input_unregister_device(keys_dev.input);
+ input_free_device(keys_dev.input);
+
+ return 0;
+}
+
static struct platform_driver nvec_kbd_driver = {
.probe = nvec_kbd_probe,
+ .remove = __devexit_p(nvec_kbd_remove),
.driver = {
.name = "nvec-kbd",
.owner = THIS_MODULE,
diff --git a/drivers/staging/nvec/nvec_power.c
b/drivers/staging/nvec/nvec_power.c
index 96c4635..2138e0a 100644
--- a/drivers/staging/nvec/nvec_power.c
+++ b/drivers/staging/nvec/nvec_power.c
@@ -407,8 +407,24 @@ static int __devinit nvec_power_probe(struct
platform_device *pdev)
return power_supply_register(&pdev->dev, psy);
}
+static int __devexit nvec_power_remove(struct platform_device *pdev)
+{
+ if (nvec_power.ac) {
+ cancel_delayed_work_sync(&nvec_power.ac->poller);
+ power_supply_unregister(&nvec_ac_psy);
+ }
+
+ if (nvec_power.bat) {
+ cancel_delayed_work_sync(&nvec_power.bat->poller);
+ power_supply_unregister(&nvec_bat_psy);
+ }
+
+ return 0;
+}
+
static struct platform_driver nvec_power_driver = {
.probe = nvec_power_probe,
+ .remove = __devexit_p(nvec_power_remove),
.driver = {
.name = "nvec-power",
.owner = THIS_MODULE,
diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index f6582d6..5d0044e 100644
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -117,6 +117,13 @@ static int __devinit nvec_mouse_probe(struct
platform_device *pdev)
return 0;
}
+static int __devexit nvec_mouse_remove(struct platform_device *pdev)
+{
+ serio_unregister_port(ps2_dev.ser_dev);
+
+ return 0;
+}
+
#ifdef CONFIG_PM_SLEEP
static int nvec_mouse_suspend(struct device *dev)
{
@@ -148,6 +155,7 @@ static const SIMPLE_DEV_PM_OPS(nvec_mouse_pm_ops,
nvec_mouse_suspend,
static struct platform_driver nvec_mouse_driver = {
.probe = nvec_mouse_probe,
+ .remove = __devexit_p(nvec_mouse_remove),
.driver = {
.name = "nvec-mouse",
.pm = &nvec_mouse_pm_ops,
--
1.7.9.5
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
