Commit 9b011407 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: drop irq_callback from struct dma_channel 



the irq member already serves the same purpose

Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 68532bda

arch/blackfin/include/asm/dma.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ struct dma_channel { 
	struct dmasg *sg;		/* large mode descriptor */

	unsigned int ctrl_num;	/* controller number */

	unsigned int irq;

	irq_handler_t irq_callback;

	void *data;

	unsigned int dma_enable_flag;

	unsigned int loopback_flag;

arch/blackfin/kernel/bfin_dma_5xx.c

+2 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ int request_dma(unsigned int channel, const char *device_id) 
#endif



	dma_ch[channel].device_id = device_id;

	dma_ch[channel].irq_callback = NULL;

	dma_ch[channel].irq = 0;



	/* This is to be enabled by putting a restriction -

	 * you have to request DMA, before doing any operations on
@@ -169,7 +169,6 @@ int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data) 
			       "Request irq in DMA engine failed.\n");

			return -EPERM;

		}

		dma_ch[channel].irq_callback = callback;

	}

	return 0;

}
@@ -185,7 +184,7 @@ void free_dma(unsigned int channel) 
	disable_dma(channel);

	clear_dma_buffer(channel);



	if (dma_ch[channel].irq_callback != NULL)

	if (dma_ch[channel].irq)

		free_irq(dma_ch[channel].irq, dma_ch[channel].data);



	/* Clear the DMA Variable in the Channel */