summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Mochel <mochel@osdl.org>2002-10-16 22:39:17 -0700
committerPatrick Mochel <mochel@osdl.org>2002-10-16 22:39:17 -0700
commit7b97a9fd22a391fdc5891f1ef48dbd7f0245d0dc (patch)
treed4f832018dbac2715d3045c0b5e57ad4986c046d
parent04013dc6090d48e8c77696b567044bb4f2376f38 (diff)
driver model (arm): change calls of remove_driver() to driver_unregister().
-rw-r--r--arch/arm/kernel/ecard.c2
-rw-r--r--drivers/input/serio/sa1111ps2.c2
-rw-r--r--drivers/pcmcia/sa1111_generic.c2
-rw-r--r--drivers/usb/host/ohci-sa1111.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 4cb68c31b86e..2b291c31ff8b 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -1114,7 +1114,7 @@ int ecard_register_driver(struct ecard_driver *drv)
void ecard_remove_driver(struct ecard_driver *drv)
{
- remove_driver(&drv->drv);
+ driver_unregister(&drv->drv);
}
static int ecard_match(struct device *_dev, struct device_driver *_drv)
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 502d3c90b864..01dc3c0681f2 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -354,7 +354,7 @@ static int __init ps2_init(void)
static void __exit ps2_exit(void)
{
- remove_driver(&ps2_driver.drv);
+ driver_unregister(&ps2_driver.drv);
}
module_init(ps2_init);
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 9bf1a6c392d4..7afea0c7b3aa 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -297,7 +297,7 @@ static int __init sa1111_drv_pcmcia_init(void)
static void __exit sa1111_drv_pcmcia_exit(void)
{
- remove_driver(&pcmcia_driver.drv);
+ driver_unregister(&pcmcia_driver.drv);
}
module_init(sa1111_drv_pcmcia_init);
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index 98996cd62d6e..e5b729e5ad39 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -413,7 +413,7 @@ static int __init ohci_hcd_sa1111_init (void)
static void __exit ohci_hcd_sa1111_cleanup (void)
{
- remove_driver(&ohci_hcd_sa1111_driver.drv);
+ driver_unregister(&ohci_hcd_sa1111_driver.drv);
}
module_init (ohci_hcd_sa1111_init);