From: Alex Dubov <oakad@yahoo.com>
Date: Sun, 10 Dec 2006 14:55:30 +0000 (+1100)
Subject: Remove unused return value from signal_irq callback
X-Git-Tag: v2.6.21-rc1~92^2~40^2~19
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=50743f4cb1d655c7fbe25af58a9d0db6bf76d687;p=cascardo%2Flinux.git

Remove unused return value from signal_irq callback

Signed-off-by: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index 50c4cdabb654..375b56742f2b 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -13,7 +13,7 @@
 #include <linux/dma-mapping.h>
 
 #define DRIVER_NAME "tifm_7xx1"
-#define DRIVER_VERSION "0.6"
+#define DRIVER_VERSION "0.7"
 
 static void tifm_7xx1_eject(struct tifm_adapter *fm, struct tifm_dev *sock)
 {
@@ -91,7 +91,7 @@ static irqreturn_t tifm_7xx1_isr(int irq, void *dev_id)
 			if (fm->sockets[cnt]) {
 				if (sock_irq_status &&
 						fm->sockets[cnt]->signal_irq)
-					sock_irq_status = fm->sockets[cnt]->
+					fm->sockets[cnt]->
 						signal_irq(fm->sockets[cnt],
 							sock_irq_status);
 
diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/tifm_sd.c
index 37fe0c3ecb85..2adfe3467019 100644
--- a/drivers/mmc/tifm_sd.c
+++ b/drivers/mmc/tifm_sd.c
@@ -323,8 +323,8 @@ change_state:
 }
 
 /* Called from interrupt handler */
-static unsigned int tifm_sd_signal_irq(struct tifm_dev *sock,
-				       unsigned int sock_irq_status)
+static void tifm_sd_signal_irq(struct tifm_dev *sock,
+			       unsigned int sock_irq_status)
 {
 	struct tifm_sd *host;
 	unsigned int host_status = 0, fifo_status = 0;
@@ -395,7 +395,6 @@ done:
 	dev_dbg(&sock->dev, "host_status %x, fifo_status %x\n",
 		host_status, fifo_status);
 	spin_unlock(&sock->lock);
-	return sock_irq_status;
 }
 
 static void tifm_sd_prepare_data(struct tifm_sd *host, struct mmc_command *cmd)
diff --git a/include/linux/tifm.h b/include/linux/tifm.h
index 9caa28e2a63c..5b0baef4e61f 100644
--- a/include/linux/tifm.h
+++ b/include/linux/tifm.h
@@ -91,7 +91,7 @@ struct tifm_dev {
 	tifm_media_id           media_id;
 	unsigned int            socket_id;
 
-	unsigned int            (*signal_irq)(struct tifm_dev *sock,
+	void                    (*signal_irq)(struct tifm_dev *sock,
 					      unsigned int sock_irq_status);
 
 	struct tifm_driver      *drv;