From d55499ecec8a5f23546cd3781133ef4498be754b Mon Sep 17 00:00:00 2001
From: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Date: Fri, 25 May 2012 10:03:05 +0200
Subject: [PATCH] --- yaml --- r: 317226 b: refs/heads/master c:
 20cf70082440ffabbec5c275726f68fe53872c94 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/ipack/bridges/tpci200.c | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 46369398b5de..89d0970366e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca2d2bb6618396ec0a79b182fcd1591ef62b07cb
+refs/heads/master: 20cf70082440ffabbec5c275726f68fe53872c94
diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c
index e04cb8ade9e7..46127bca1af2 100644
--- a/trunk/drivers/staging/ipack/bridges/tpci200.c
+++ b/trunk/drivers/staging/ipack/bridges/tpci200.c
@@ -751,23 +751,12 @@ static int tpci200_request_irq(struct ipack_device *dev, int vector,
 	return res;
 }
 
-static void tpci200_slot_remove(struct tpci200_slot *slot)
-{
-	if ((slot->dev == NULL) ||
-	    (slot->dev->driver == NULL) ||
-	    (slot->dev->driver->ops == NULL) ||
-	    (slot->dev->driver->ops->remove == NULL))
-		return;
-
-	slot->dev->driver->ops->remove(slot->dev);
-}
-
 static void tpci200_uninstall(struct tpci200_board *tpci200)
 {
 	int i;
 
 	for (i = 0; i < TPCI200_NB_SLOT; i++)
-		tpci200_slot_remove(&tpci200->slots[i]);
+		tpci200_slot_unregister(tpci200->slots[i].dev);
 
 	tpci200_unregister(tpci200);
 	kfree(tpci200->slots);