Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53e62d3a authored Sep 25, 2006 by Ralf Baechle Committed by Linus Torvalds Sep 26, 2006

[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>

parent cf134483

arch/mips/au1000/common/dbdma.c

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -230,7 +230,7 @@ EXPORT_SYMBOL(au1xxx_ddma_add_device);
	*/		*/
	u32		u32
	au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,		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;		unsigned long flags;
	u32 used, chan, rv;		u32 used, chan, rv;
	@@ -248,8 +248,10 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
	au1xxx_dbdma_init();		au1xxx_dbdma_init();
	dbdma_initialized = 1;		dbdma_initialized = 1;

	if ((stp = find_dbdev_id(srcid)) == NULL) return 0;		if ((stp = find_dbdev_id(srcid)) == NULL)
	if ((dtp = find_dbdev_id(destid)) == NULL) return 0;		return 0;
			if ((dtp = find_dbdev_id(destid)) == NULL)
			return 0;

	used = 0;		used = 0;
	rv = 0;		rv = 0;
	@@ -869,7 +871,7 @@ dbdma_interrupt(int irq, void dev_id, struct pt_regs regs)
	au_sync();		au_sync();

	if (ctp->chan_callback)		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));		ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
	return IRQ_RETVAL(1);		return IRQ_RETVAL(1);

drivers/ide/mips/au1xxx-ide.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -476,13 +476,13 @@ static int auide_dma_lostirq(ide_drive_t *drive)
	return 0;		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;		_auide_hwif ahwif = (_auide_hwif)param;
	ahwif->drive->waiting_for_dma = 0;		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;		_auide_hwif ahwif = (_auide_hwif)param;
	ahwif->drive->waiting_for_dma = 0;		ahwif->drive->waiting_for_dma = 0;

drivers/mmc/au1xmmc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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;		struct au1xmmc_host host = (struct au1xmmc_host ) dev_id;

include/asm-mips/mach-au1x00/au1xxx_dbdma.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -316,7 +316,7 @@ typedef struct dbdma_chan_config {
	au1x_ddma_desc_t *chan_desc_base;		au1x_ddma_desc_t *chan_desc_base;
	au1x_ddma_desc_t get_ptr, put_ptr, *cur_ptr;		au1x_ddma_desc_t get_ptr, put_ptr, *cur_ptr;
	void *chan_callparam;		void *chan_callparam;
	void (chan_callback)(int, void , struct pt_regs *);		void (chan_callback)(int, void );
	} chan_tab_t;		} chan_tab_t;

	#define DEV_FLAGS_INUSE (1 << 0)		#define DEV_FLAGS_INUSE (1 << 0)
	@@ -334,8 +334,8 @@ typedef struct dbdma_chan_config {
	* meaningful name. The 'callback' is called during dma completion		* meaningful name. The 'callback' is called during dma completion
	* interrupt.		* interrupt.
	*/		*/
	u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,		extern u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
	void (callback)(int, void , struct pt_regs ), void callparam);		void (callback)(int, void ), void *callparam);

	#define DBDMA_MEM_CHAN DSCR_CMD0_ALWAYS		#define DBDMA_MEM_CHAN DSCR_CMD0_ALWAYS

sound/oss/au1550_ac97.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -719,8 +719,7 @@ prog_dmabuf_dac(struct au1550_state *s)
	}		}


	static void		static void dac_dma_interrupt(int irq, void *dev_id)
	dac_dma_interrupt(int irq, void dev_id, struct pt_regs regs)
	{		{
	struct au1550_state s = (struct au1550_state ) dev_id;		struct au1550_state s = (struct au1550_state ) dev_id;
	struct dmabuf *db = &s->dma_dac;		struct dmabuf *db = &s->dma_dac;
	@@ -754,8 +753,7 @@ dac_dma_interrupt(int irq, void dev_id, struct pt_regs regs)
	}		}


	static void		static void adc_dma_interrupt(int irq, void *dev_id)
	adc_dma_interrupt(int irq, void dev_id, struct pt_regs regs)
	{		{
	struct au1550_state s = (struct au1550_state )dev_id;		struct au1550_state s = (struct au1550_state )dev_id;
	struct dmabuf *dp = &s->dma_adc;		struct dmabuf *dp = &s->dma_adc;