aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ipack
diff options
context:
space:
mode:
authorSamuel Iglesias Gonsálvez <siglesias@igalia.com>2012-09-11 13:35:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-11 12:18:11 -0700
commit9c0d169e8fd9637eebe98e1ad4e61c0de9edc43e (patch)
treead607aa602600f330a2d3802abc2bf315064a7e8 /drivers/staging/ipack
parentStaging: ipack: unregister devices when uninstall the carrier device. (diff)
downloadlinux-dev-9c0d169e8fd9637eebe98e1ad4e61c0de9edc43e.tar.xz
linux-dev-9c0d169e8fd9637eebe98e1ad4e61c0de9edc43e.zip
Staging: ipack/bridges/tpci200: delete ipack_device_unregister calls when exiting
As the ipack_bus_unregister() takes care of unregistering the devices plugged in the carrier, it is not needed to do it in the carrier driver. Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ipack')
-rw-r--r--drivers/staging/ipack/bridges/tpci200.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c
index 77e6392fee08..8de74c97d76b 100644
--- a/drivers/staging/ipack/bridges/tpci200.c
+++ b/drivers/staging/ipack/bridges/tpci200.c
@@ -610,11 +610,6 @@ static int tpci200_reset_timeout(struct ipack_device *dev)
static void tpci200_uninstall(struct tpci200_board *tpci200)
{
- int i;
-
- for (i = 0; i < TPCI200_NB_SLOT; i++)
- ipack_device_unregister(tpci200->slots[i].dev);
-
tpci200_unregister(tpci200);
kfree(tpci200->slots);
}
@@ -751,8 +746,8 @@ out_err_info:
static void __tpci200_pci_remove(struct tpci200_board *tpci200)
{
- tpci200_uninstall(tpci200);
ipack_bus_unregister(tpci200->info->ipack_bus);
+ tpci200_uninstall(tpci200);
kfree(tpci200->info);
kfree(tpci200);