From: Samuel Iglesias Gonsálvez Date: Tue, 11 Sep 2012 11:35:11 +0000 (+0200) Subject: Staging: ipack/bridges/tpci200: remove tpci200_slot_unregister X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=daf8007c02558a61a27ba035844787269406274e;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Staging: ipack/bridges/tpci200: remove tpci200_slot_unregister It is not needed as the IP module should free its IRQ using tpci200_free_irq callback. Signed-off-by: Samuel Iglesias Gonsálvez Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c index 8de74c97d76b..0823cdbb3e6d 100644 --- a/drivers/staging/ipack/bridges/tpci200.c +++ b/drivers/staging/ipack/bridges/tpci200.c @@ -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,