Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=50743f4cb1d655c7fbe25af58a9d0db6bf76d687
Commit: 50743f4cb1d655c7fbe25af58a9d0db6bf76d687
Parent: 2e8ce5e7414e74fe8904495b1f22cf00d3349398
Author: Alex Dubov <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 11 01:55:30 2006 +1100
Committer: Pierre Ossman <[EMAIL PROTECTED]>
CommitDate: Sun Feb 4 20:54:08 2007 +0100
Remove unused return value from signal_irq callback
Signed-off-by: Alex Dubov <[EMAIL PROTECTED]>
Signed-off-by: Pierre Ossman <[EMAIL PROTECTED]>
---
drivers/misc/tifm_7xx1.c | 4 ++--
drivers/mmc/tifm_sd.c | 5 ++---
include/linux/tifm.h | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index 50c4cda..375b567 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 37fe0c3..2adfe34 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 9caa28e..5b0baef 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
