[SPARC64]: Fix parport_pc build. (74bd7d09) · Commits · e / devices / android_kernel_fairphone_FP3

include/asm-sparc64/dma.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -205,10 +205,6 @@ do { u32 tmp = sbus_readl((__regs) + DMA_CSR); \
		#define for_each_dvma(dma) \
		for((dma) = dma_chain; (dma); (dma) = (dma)->next)

		extern int get_dma_list(char *);
		extern int request_dma(unsigned int, __const__ char *);
		extern void free_dma(unsigned int);

		/* From PCI */

		#ifdef CONFIG_PCI

+22 −0

Original line number	Diff line number	Diff line
		@@ -23,8 +23,30 @@ static struct sparc_ebus_info {
		struct ebus_dma_info info;
		unsigned int addr;
		unsigned int count;
		int lock;
		} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];

		static __inline__ int request_dma(unsigned int dmanr, const char *device_id)
		{
		if (dmanr >= PARPORT_PC_MAX_PORTS)
		return -EINVAL;
		if (xchg(&sparc_ebus_dmas[dmanr].lock, 1) != 0)
		return -EBUSY;
		return 0;
		}

		static __inline__ void free_dma(unsigned int dmanr)
		{
		if (dmanr >= PARPORT_PC_MAX_PORTS) {
		printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
		return;
		}
		if (xchg(&sparc_ebus_dmas[dmanr].lock, 0) == 0) {
		printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
		return;
		}
		}

		static __inline__ void enable_dma(unsigned int dmanr)
		{
		ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);