Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] Alchemy: Delete unused pt_regs * argument from au1xxx_dbdma_chan_alloc

The third argument of au1xxx_dbdma_chan_alloc's callback function is not
used anywhere.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Ralf Baechle and committed by
Linus Torvalds
53e62d3a cf134483

+14 -14
+6 -4
arch/mips/au1000/common/dbdma.c
··· 230 230 */ 231 231 u32 232 232 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, 233 - void (*callback)(int, void *, struct pt_regs *), void *callparam) 233 + void (*callback)(int, void *), void *callparam) 234 234 { 235 235 unsigned long flags; 236 236 u32 used, chan, rv; ··· 248 248 au1xxx_dbdma_init(); 249 249 dbdma_initialized = 1; 250 250 251 - if ((stp = find_dbdev_id(srcid)) == NULL) return 0; 252 - if ((dtp = find_dbdev_id(destid)) == NULL) return 0; 251 + if ((stp = find_dbdev_id(srcid)) == NULL) 252 + return 0; 253 + if ((dtp = find_dbdev_id(destid)) == NULL) 254 + return 0; 253 255 254 256 used = 0; 255 257 rv = 0; ··· 871 869 au_sync(); 872 870 873 871 if (ctp->chan_callback) 874 - (ctp->chan_callback)(irq, ctp->chan_callparam, regs); 872 + (ctp->chan_callback)(irq, ctp->chan_callparam); 875 873 876 874 ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); 877 875 return IRQ_RETVAL(1);
+2 -2
drivers/ide/mips/au1xxx-ide.c
··· 476 476 return 0; 477 477 } 478 478 479 - static void auide_ddma_tx_callback(int irq, void *param, struct pt_regs *regs) 479 + static void auide_ddma_tx_callback(int irq, void *param) 480 480 { 481 481 _auide_hwif *ahwif = (_auide_hwif*)param; 482 482 ahwif->drive->waiting_for_dma = 0; 483 483 } 484 484 485 - static void auide_ddma_rx_callback(int irq, void *param, struct pt_regs *regs) 485 + static void auide_ddma_rx_callback(int irq, void *param) 486 486 { 487 487 _auide_hwif *ahwif = (_auide_hwif*)param; 488 488 ahwif->drive->waiting_for_dma = 0;
+1 -1
drivers/mmc/au1xmmc.c
··· 731 731 } 732 732 } 733 733 734 - static void au1xmmc_dma_callback(int irq, void *dev_id, struct pt_regs *regs) 734 + static void au1xmmc_dma_callback(int irq, void *dev_id) 735 735 { 736 736 struct au1xmmc_host *host = (struct au1xmmc_host *) dev_id; 737 737
+3 -3
include/asm-mips/mach-au1x00/au1xxx_dbdma.h
··· 316 316 au1x_ddma_desc_t *chan_desc_base; 317 317 au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr; 318 318 void *chan_callparam; 319 - void (*chan_callback)(int, void *, struct pt_regs *); 319 + void (*chan_callback)(int, void *); 320 320 } chan_tab_t; 321 321 322 322 #define DEV_FLAGS_INUSE (1 << 0) ··· 334 334 * meaningful name. The 'callback' is called during dma completion 335 335 * interrupt. 336 336 */ 337 - u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, 338 - void (*callback)(int, void *, struct pt_regs *), void *callparam); 337 + extern u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, 338 + void (*callback)(int, void *), void *callparam); 339 339 340 340 #define DBDMA_MEM_CHAN DSCR_CMD0_ALWAYS 341 341
+2 -4
sound/oss/au1550_ac97.c
··· 719 719 } 720 720 721 721 722 - static void 723 - dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) 722 + static void dac_dma_interrupt(int irq, void *dev_id) 724 723 { 725 724 struct au1550_state *s = (struct au1550_state *) dev_id; 726 725 struct dmabuf *db = &s->dma_dac; ··· 753 754 } 754 755 755 756 756 - static void 757 - adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) 757 + static void adc_dma_interrupt(int irq, void *dev_id) 758 758 { 759 759 struct au1550_state *s = (struct au1550_state *)dev_id; 760 760 struct dmabuf *dp = &s->dma_adc;