[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <4A4A16260200007800008340@vpn.id2.novell.com>
Date: Tue, 30 Jun 2009 12:41:58 +0100
From: "Jan Beulich" <JBeulich@...ell.com>
To: <dhowells@...hat.com>, <linux-kernel@...r.kernel.org>
Subject: [PATCH] Fix hpet_(un)register_irq_handler() again for
emulation
Commit 32fa458688fa2e68bc433929b2d4941eef7efe39 didn't really succeed
in what it was trying to do - depending on the compiler version, the
"statement with no effect" warnings still exist.
Since hpet_register_irq_handler() has its return value used, it can be
restored to expand to a plain 0 again.
For hpet_unregister_irq_handler(), an expression the effective of is
"void" ought to be used instead.
Signed-off-by: Jan Beulich <jbeulich@...ell.com>
---
drivers/char/rtc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-2.6.31-rc1/drivers/char/rtc.c 2009-03-24 00:12:14.000000000 +0100
+++ 2.6.31-rc1-rtc-warnings/drivers/char/rtc.c 2009-06-24 16:30:02.000000000 +0200
@@ -112,8 +112,8 @@ static int rtc_has_irq = 1;
#define hpet_set_rtc_irq_bit(arg) 0
#define hpet_rtc_timer_init() do { } while (0)
#define hpet_rtc_dropped_irq() 0
-#define hpet_register_irq_handler(h) ({ 0; })
-#define hpet_unregister_irq_handler(h) ({ 0; })
+#define hpet_register_irq_handler(h) 0
+#define hpet_unregister_irq_handler(h) ((void)0)
#ifdef RTC_IRQ
static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists