The patch titled
Alchemy: Delete unused pt_regs * argument from au1xxx_dbdma_chan_alloc
has been added to the -mm tree. Its filename is
alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Alchemy: Delete unused pt_regs * argument from au1xxx_dbdma_chan_alloc
From: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
The third argument of au1xxx_dbdma_chan_alloc's callback function is not
used anywhere.
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/mips/au1000/common/dbdma.c | 10 ++++++----
drivers/ide/mips/au1xxx-ide.c | 4 ++--
drivers/mmc/au1xmmc.c | 2 +-
include/asm-mips/mach-au1x00/au1xxx_dbdma.h | 6 +++---
sound/oss/au1550_ac97.c | 6 ++----
5 files changed, 14 insertions(+), 14 deletions(-)
diff -puN arch/mips/au1000/common/dbdma.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc arch/mips/au1000/common/dbdma.c
--- a/arch/mips/au1000/common/dbdma.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc
+++ a/arch/mips/au1000/common/dbdma.c
@@ -230,7 +230,7 @@ EXPORT_SYMBOL(au1xxx_ddma_add_device);
*/
u32
au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
- void (*callback)(int, void *, struct pt_regs *), void *callparam)
+ void (*callback)(int, void *), void *callparam)
{
unsigned long flags;
u32 used, chan, rv;
@@ -248,8 +248,10 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
au1xxx_dbdma_init();
dbdma_initialized = 1;
- if ((stp = find_dbdev_id(srcid)) == NULL) return 0;
- if ((dtp = find_dbdev_id(destid)) == NULL) return 0;
+ if ((stp = find_dbdev_id(srcid)) == NULL)
+ return 0;
+ if ((dtp = find_dbdev_id(destid)) == NULL)
+ return 0;
used = 0;
rv = 0;
@@ -869,7 +871,7 @@ dbdma_interrupt(int irq, void *dev_id, s
au_sync();
if (ctp->chan_callback)
- (ctp->chan_callback)(irq, ctp->chan_callparam, regs);
+ (ctp->chan_callback)(irq, ctp->chan_callparam);
ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
return IRQ_RETVAL(1);
diff -puN drivers/ide/mips/au1xxx-ide.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc drivers/ide/mips/au1xxx-ide.c
--- a/drivers/ide/mips/au1xxx-ide.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc
+++ a/drivers/ide/mips/au1xxx-ide.c
@@ -476,13 +476,13 @@ static int auide_dma_lostirq(ide_drive_t
return 0;
}
-static void auide_ddma_tx_callback(int irq, void *param, struct pt_regs *regs)
+static void auide_ddma_tx_callback(int irq, void *param)
{
_auide_hwif *ahwif = (_auide_hwif*)param;
ahwif->drive->waiting_for_dma = 0;
}
-static void auide_ddma_rx_callback(int irq, void *param, struct pt_regs *regs)
+static void auide_ddma_rx_callback(int irq, void *param)
{
_auide_hwif *ahwif = (_auide_hwif*)param;
ahwif->drive->waiting_for_dma = 0;
diff -puN drivers/mmc/au1xmmc.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc drivers/mmc/au1xmmc.c
--- a/drivers/mmc/au1xmmc.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc
+++ a/drivers/mmc/au1xmmc.c
@@ -731,7 +731,7 @@ static void au1xmmc_set_ios(struct mmc_h
}
}
-static void au1xmmc_dma_callback(int irq, void *dev_id, struct pt_regs *regs)
+static void au1xmmc_dma_callback(int irq, void *dev_id)
{
struct au1xmmc_host *host = (struct au1xmmc_host *) dev_id;
diff -puN include/asm-mips/mach-au1x00/au1xxx_dbdma.h~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc include/asm-mips/mach-au1x00/au1xxx_dbdma.h
--- a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc
+++ a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h
@@ -316,7 +316,7 @@ typedef struct dbdma_chan_config {
au1x_ddma_desc_t *chan_desc_base;
au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr;
void *chan_callparam;
- void (*chan_callback)(int, void *, struct pt_regs *);
+ void (*chan_callback)(int, void *);
} chan_tab_t;
#define DEV_FLAGS_INUSE (1 << 0)
@@ -334,8 +334,8 @@ typedef struct dbdma_chan_config {
* meaningful name. The 'callback' is called during dma completion
* interrupt.
*/
-u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
- void (*callback)(int, void *, struct pt_regs *), void *callparam);
+extern u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
+ void (*callback)(int, void *), void *callparam);
#define DBDMA_MEM_CHAN DSCR_CMD0_ALWAYS
diff -puN sound/oss/au1550_ac97.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc sound/oss/au1550_ac97.c
--- a/sound/oss/au1550_ac97.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc
+++ a/sound/oss/au1550_ac97.c
@@ -719,8 +719,7 @@ prog_dmabuf_dac(struct au1550_state *s)
}
-static void
-dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static void dac_dma_interrupt(int irq, void *dev_id)
{
struct au1550_state *s = (struct au1550_state *) dev_id;
struct dmabuf *db = &s->dma_dac;
@@ -754,8 +753,7 @@ dac_dma_interrupt(int irq, void *dev_id,
}
-static void
-adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static void adc_dma_interrupt(int irq, void *dev_id)
{
struct au1550_state *s = (struct au1550_state *)dev_id;
struct dmabuf *dp = &s->dma_adc;
_
Patches currently in -mm which might be from ralf@xxxxxxxxxxxxxx are
headers_check-fix-userspace-build-of-asm-mips-pageh.patch
kthread-update-arch-mips-kernel-apmc.patch
git-netdev-all.patch
alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
sound-mips-au1x00-use-array_size-macro.patch
simplify-update_times-avoid-jiffies-jiffies_64-aliasing-problem-2.patch
kill-wall_jiffies.patch
generic-ioremap_page_range-implementation.patch
generic-ioremap_page_range-flush_cache_vmap.patch
generic-ioremap_page_range-mips-conversion.patch
generic-ioremap_page_range-mips-conversion-fix.patch
introduce-kernel_execve.patch
rename-the-provided-execve-functions-to-kernel_execve.patch
provide-kernel_execve-on-all-architectures.patch
provide-kernel_execve-on-all-architectures-fix.patch
provide-kernel_execve-on-all-architectures-mips-fix.patch
remove-the-use-of-_syscallx-macros-in-uml.patch
sh64-remove-the-use-of-kernel-syscalls.patch
remove-remaining-errno-and-__kernel_syscalls__-references.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
