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

Commit 576132b4 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] frv: misc sparse annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 53470aaa

arch/frv/kernel/irq-routing.c

+4 −4
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ struct irq_source frv_cpuuart[2] = { 
#define __CPUUART(X, A)						\

	[X] = {							\

		.muxname	= "uart",			\

		.muxdata	= (volatile void __iomem *) A,	\

		.muxdata	= (volatile void __iomem *)(unsigned long)A,\

		.irqmask	= 1 << IRQ_CPU_UART##X,		\

		.doirq		= frv_cpuuart_doirq,		\

	}
@@ -136,7 +136,7 @@ struct irq_source frv_cpudma[8] = { 
#define __CPUDMA(X, A)						\

	[X] = {							\

		.muxname	= "dma",			\

		.muxdata	= (volatile void __iomem *) A,	\

		.muxdata	= (volatile void __iomem *)(unsigned long)A,\

		.irqmask	= 1 << IRQ_CPU_DMA##X,		\

		.doirq		= frv_cpudma_doirq,		\

	}
@@ -164,7 +164,7 @@ struct irq_source frv_cputimer[3] = { 
#define __CPUTIMER(X)						\

	[X] = {							\

		.muxname	= "timer",			\

		.muxdata	= 0,				\

		.muxdata	= NULL,				\

		.irqmask	= 1 << IRQ_CPU_TIMER##X,	\

		.doirq		= frv_cputimer_doirq,		\

	}
@@ -187,7 +187,7 @@ struct irq_source frv_cpuexternal[8] = { 
#define __CPUEXTERNAL(X)					\

	[X] = {							\

		.muxname	= "ext",			\

		.muxdata	= 0,				\

		.muxdata	= NULL,				\

		.irqmask	= 1 << IRQ_CPU_EXTERNAL##X,	\

		.doirq		= frv_cpuexternal_doirq,	\

	}

arch/frv/mb93090-mb00/pci-irq.c

+5 −5
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ 
 */



static const uint8_t __initdata pci_bus0_irq_routing[32][4] = {

	[0 ] {	IRQ_FPGA_MB86943_PCI_INTA },

	[16] {	IRQ_FPGA_RTL8029_INTA },

	[17] {	IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB },

	[18] {	IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA },

	[19] {	IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD },

	[0 ] = { IRQ_FPGA_MB86943_PCI_INTA },

	[16] = { IRQ_FPGA_RTL8029_INTA },

	[17] = { IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB },

	[18] = { IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA },

	[19] = { IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD },

};



void __init pcibios_irq_init(void)

include/asm-frv/highmem.h

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type) 


	default:

		BUG();

		return 0;

		return NULL;

	}

}