From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754065AbXJUH5D (ORCPT ); Sun, 21 Oct 2007 03:57:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752684AbXJUHwz (ORCPT ); Sun, 21 Oct 2007 03:52:55 -0400 Received: from havoc.gtf.org ([69.61.125.42]:37273 "EHLO havoc.gtf.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752631AbXJUHwv (ORCPT ); Sun, 21 Oct 2007 03:52:51 -0400 To: LKML Cc: a.zummo@towertech.it, linux-serial@vger.kernel.org From: Jeff Garzik Subject: [PATCH 15/17] serial, rtc/ds1374: irq handler cleanups References: Message-Id: <20071021075250.C6DD919041B@havoc.gtf.org> Date: Sun, 21 Oct 2007 03:52:50 -0400 (EDT) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org commit 9f306bb4ff39adbd2ce83491c202f5fb87baaa45 Author: Jeff Garzik Date: Fri Oct 19 19:35:26 2007 -0400 serial, rtc/ds1374: irq handler cleanups * no need to use 'irq' function argument Signed-off-by: Jeff Garzik drivers/rtc/rtc-ds1374.c | 4 ++-- drivers/serial/8250.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 9f306bb4ff39adbd2ce83491c202f5fb87baaa45 diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 45bda18..06017e1 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c @@ -257,12 +257,12 @@ out: return ret; } -static irqreturn_t ds1374_irq(int irq, void *dev_id) +static irqreturn_t ds1374_irq(int dummy, void *dev_id) { struct i2c_client *client = dev_id; struct ds1374 *ds1374 = i2c_get_clientdata(client); - disable_irq_nosync(irq); + disable_irq_nosync(client->irq); schedule_work(&ds1374->work); return IRQ_HANDLED; } diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 0d661ba..9c0f82e 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -1458,7 +1458,7 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id) struct list_head *l, *end = NULL; int pass_counter = 0, handled = 0; - DEBUG_INTR("serial8250_interrupt(%d)...", irq); + DEBUG_INTR("serial8250_interrupt..."); spin_lock(&i->lock); @@ -1497,7 +1497,7 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id) if (l == i->head && pass_counter++ > PASS_LIMIT) { /* If we hit this, we're dead. */ printk(KERN_ERR "serial8250: too much work for " - "irq%d\n", irq); + "irq%d\n", up->port.irq); break; } } while (l != end);