]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Staging: ipack/bridges/tpci200: remove tpci200_slot_unregister
authorSamuel Iglesias Gonsálvez <siglesias@igalia.com>
Tue, 11 Sep 2012 11:35:11 +0000 (13:35 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Sep 2012 19:18:12 +0000 (12:18 -0700)
It is not needed as the IP module should free its IRQ using
tpci200_free_irq callback.

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ipack/bridges/tpci200.c

index 8de74c97d76bf88cf346533ef0227c43af73fc1b..0823cdbb3e6dd48ed94186a2eda6612147b15fcb 100644 (file)
@@ -28,8 +28,6 @@ static u16 tpci200_status_error[] = {
        TPCI200_D_ERROR,
 };
 
-static int tpci200_slot_unregister(struct ipack_device *dev);
-
 static struct tpci200_board *check_slot(struct ipack_device *dev)
 {
        struct tpci200_board *tpci200;
@@ -368,28 +366,6 @@ out_unlock:
        return 0;
 }
 
-static int tpci200_slot_unregister(struct ipack_device *dev)
-{
-       struct tpci200_board *tpci200;
-
-       if (dev == NULL)
-               return -ENODEV;
-
-       tpci200 = check_slot(dev);
-       if (tpci200 == NULL)
-               return -EINVAL;
-
-       tpci200_free_irq(dev);
-
-       if (mutex_lock_interruptible(&tpci200->mutex))
-               return -ERESTARTSYS;
-
-       tpci200->slots[dev->slot].dev = NULL;
-       mutex_unlock(&tpci200->mutex);
-
-       return 0;
-}
-
 static int tpci200_slot_map_space(struct ipack_device *dev,
                                  unsigned int memory_size, int space)
 {
@@ -619,7 +595,7 @@ static const struct ipack_bus_ops tpci200_bus_ops = {
        .unmap_space = tpci200_slot_unmap_space,
        .request_irq = tpci200_request_irq,
        .free_irq = tpci200_free_irq,
-       .remove_device = tpci200_slot_unregister,
+       .remove_device = NULL,
        .get_clockrate = tpci200_get_clockrate,
        .set_clockrate = tpci200_set_clockrate,
        .get_error     = tpci200_get_error,