[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>
This commit is contained in:
Родитель
cf134483b2
Коммит
53e62d3aaa
|
@ -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 destid,
|
|||
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, struct pt_regs *regs)
|
|||
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);
|
||||
|
|
|
@ -476,13 +476,13 @@ static int auide_dma_lostirq(ide_drive_t *drive)
|
|||
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;
|
||||
|
|
|
@ -731,7 +731,7 @@ static void au1xmmc_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
|
|||
}
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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, struct pt_regs *regs)
|
|||
}
|
||||
|
||||
|
||||
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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче