From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932154Ab2IKLex (ORCPT ); Tue, 11 Sep 2012 07:34:53 -0400 Received: from smtp4.mundo-r.com ([212.51.32.151]:26724 "EHLO smtp4.mundo-r.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759272Ab2IKLet (ORCPT ); Tue, 11 Sep 2012 07:34:49 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AsgCAIAhT1BbdWObgWdsb2JhbABFhge1SSIBARYmJ4IgAQEFIwQLAUYQIAUCJgICVwYTiBSoaJM3gSGPA4ESA5VdiTOJUg X-IronPort-AV: E=Sophos;i="4.80,404,1344204000"; d="scan'208";a="564505393" From: =?UTF-8?q?Samuel=20Iglesias=20Gons=C3=A1lvez?= To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, industrypack-devel@lists.sourceforge.net, Jens Taprogge , =?UTF-8?q?Samuel=20Iglesias=20Gons=C3=A1lvez?= Subject: [PATCH v2 20/20] Staging: ipack/bridges/tpci200: Store the irq holder in slot_irq. Date: Tue, 11 Sep 2012 13:35:13 +0200 Message-Id: <1347363313-17094-21-git-send-email-siglesias@igalia.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1347363313-17094-1-git-send-email-siglesias@igalia.com> References: <1347363313-17094-1-git-send-email-siglesias@igalia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jens Taprogge This way we do no longer need to keep a dangling pointer to struct ipack_device in tpci200_slot after the device has been removed. Signed-off-by: Jens Taprogge Signed-off-by: Samuel Iglesias Gonsálvez --- drivers/staging/ipack/bridges/tpci200.c | 19 ++++++++++++------- drivers/staging/ipack/bridges/tpci200.h | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c index 5aff0d0..9d886b7 100644 --- a/drivers/staging/ipack/bridges/tpci200.c +++ b/drivers/staging/ipack/bridges/tpci200.c @@ -89,6 +89,7 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id) unsigned short status_reg, reg_value; unsigned short unhandled_ints = 0; irqreturn_t ret = IRQ_NONE; + struct slot_irq *slot_irq; /* Read status register */ status_reg = readw(&tpci200->info->interface_regs->status); @@ -97,15 +98,17 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id) unhandled_ints = status_reg & TPCI200_SLOT_INT_MASK; /* callback to the IRQ handler for the corresponding slot */ for (i = 0; i < TPCI200_NB_SLOT; i++) { - if ((tpci200->slots[i].irq != NULL) && + slot_irq = tpci200->slots[i].irq; + + if ((slot_irq != NULL) && (status_reg & ((TPCI200_A_INT0 | TPCI200_A_INT1) << (2*i)))) { - ret = tpci200->slots[i].irq->handler(tpci200->slots[i].irq->arg); + ret = slot_irq->handler(slot_irq->arg); /* Dummy reads */ - readw(tpci200->slots[i].dev->io_space.address + + readw(slot_irq->holder->io_space.address + 0xC0); - readw(tpci200->slots[i].dev->io_space.address + + readw(slot_irq->holder->io_space.address + 0xC2); unhandled_ints &= ~(((TPCI200_A_INT0 | TPCI200_A_INT1) << (2*i))); @@ -115,8 +118,10 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id) /* Interrupts not handled are disabled */ if (unhandled_ints) { for (i = 0; i < TPCI200_NB_SLOT; i++) { + slot_irq = tpci200->slots[i].irq; + if (unhandled_ints & ((TPCI200_INT0_EN | TPCI200_INT1_EN) << (2*i))) { - dev_info(&tpci200->slots[i].dev->dev, + dev_info(&slot_irq->holder->dev, "No registered ISR for slot [%d:%d]!. IRQ will be disabled.\n", tpci200->number, i); reg_value = readw( @@ -487,6 +492,7 @@ static int tpci200_request_irq(struct ipack_device *dev, int vector, slot_irq->vector = vector; slot_irq->handler = handler; slot_irq->arg = arg; + slot_irq->holder = dev; tpci200->slots[dev->slot].irq = slot_irq; res = __tpci200_request_irq(tpci200, dev); @@ -701,8 +707,7 @@ static int tpci200_pci_probe(struct pci_dev *pdev, * The TPCI200 has assigned his own two IRQ by PCI bus driver */ for (i = 0; i < TPCI200_NB_SLOT; i++) - tpci200->slots[i].dev = - ipack_device_register(tpci200->info->ipack_bus, i, i); + ipack_device_register(tpci200->info->ipack_bus, i, i); return 0; out_err_bus_register: diff --git a/drivers/staging/ipack/bridges/tpci200.h b/drivers/staging/ipack/bridges/tpci200.h index fc90a94..75a5dcc 100644 --- a/drivers/staging/ipack/bridges/tpci200.h +++ b/drivers/staging/ipack/bridges/tpci200.h @@ -121,6 +121,7 @@ struct tpci200_regs { * */ struct slot_irq { + struct ipack_device *holder; int vector; int (*handler)(void *); void *arg; @@ -136,7 +137,6 @@ struct slot_irq { * */ struct tpci200_slot { - struct ipack_device *dev; struct slot_irq *irq; struct ipack_addr_space io_phys; struct ipack_addr_space id_phys; -- 1.7.10.4