From 2f8ff6c6be85e52a0e7414e9a9d99a11ae28e8c6 Mon Sep 17 00:00:00 2001 From: Samuel Iglesias Gonsalvez Date: Wed, 23 May 2012 15:54:46 +0200 Subject: [PATCH] --- yaml --- r: 317220 b: refs/heads/master c: 1fc75280f1e48d8f941dfea881d0f5b53fca27f6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/bridges/tpci200.c | 1 - trunk/drivers/staging/ipack/bridges/tpci200.h | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 35107fc5c59d..b915f3bc9041 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e149ef80b08d92a27a9a8333719fe392955af798 +refs/heads/master: 1fc75280f1e48d8f941dfea881d0f5b53fca27f6 diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c index 24070a3ff210..96bfe5b3ca23 100644 --- a/trunk/drivers/staging/ipack/bridges/tpci200.c +++ b/trunk/drivers/staging/ipack/bridges/tpci200.c @@ -750,7 +750,6 @@ 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->name = dev_name(&dev->dev); tpci200->slots[dev->slot].irq = slot_irq; res = __tpci200_request_irq(tpci200, dev); diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.h b/trunk/drivers/staging/ipack/bridges/tpci200.h index eedb00756206..97ff0d6636b6 100644 --- a/trunk/drivers/staging/ipack/bridges/tpci200.h +++ b/trunk/drivers/staging/ipack/bridges/tpci200.h @@ -105,14 +105,12 @@ * @vector Vector number * @handler Handler called when IRQ arrives * @arg Handler argument - * @name IRQ name * */ struct slot_irq { int vector; int (*handler)(void *); void *arg; - const char *name; }; /**