Commit 472bc4f2 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: rename sparc_irq_config to sparc_config 



This struct holds platform specific config and is thus not
limited to irq stuff.
Do not let the name confuse us to think this is irq only.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 78b7e3d0

arch/sparc/kernel/irq.h

+3 −3
Original line number Diff line number Diff line
@@ -42,16 +42,16 @@ extern struct sun4m_irq_percpu __iomem *sun4m_irq_percpu[SUN4M_NCPUS]; 
extern struct sun4m_irq_global __iomem *sun4m_irq_global;



/*

 * Platform specific irq configuration

 * Platform specific configuration

 * The individual platforms assign their platform

 * specifics in their init functions.

 */

struct sparc_irq_config {

struct sparc_config {

	void (*init_timers)(irq_handler_t);

	unsigned int (*build_device_irq)(struct platform_device *op,

	                                 unsigned int real_irq);

};

extern struct sparc_irq_config sparc_irq_config;

extern struct sparc_config sparc_config;



unsigned int irq_alloc(unsigned int real_irq, unsigned int pil);

void irq_link(unsigned int irq);

arch/sparc/kernel/irq_32.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#endif /* SMP */



/* platform specific irq setup */

struct sparc_irq_config sparc_irq_config;

struct sparc_config sparc_config;



unsigned long arch_local_irq_save(void)

{

arch/sparc/kernel/leon_kernel.c

+2 −2
Original line number Diff line number Diff line
@@ -494,8 +494,8 @@ void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu) 


void __init leon_init_IRQ(void)

{

	sparc_irq_config.init_timers      = leon_init_timers;

	sparc_irq_config.build_device_irq = _leon_build_device_irq;

	sparc_config.init_timers      = leon_init_timers;

	sparc_config.build_device_irq = _leon_build_device_irq;



	BTFIXUPSET_CALL(clear_clock_irq, leon_clear_clock_irq,

			BTFIXUPCALL_NORM);

arch/sparc/kernel/of_device_32.c

+2 −2
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static struct platform_device * __init scan_one_device(struct device_node *dp, 
		op->archdata.num_irqs = len / sizeof(struct linux_prom_irqs);

		for (i = 0; i < op->archdata.num_irqs; i++)

			op->archdata.irqs[i] =

			    sparc_irq_config.build_device_irq(op, intr[i].pri);

			    sparc_config.build_device_irq(op, intr[i].pri);

	} else {

		const unsigned int *irq =

			of_get_property(dp, "interrupts", &len);
@@ -365,7 +365,7 @@ static struct platform_device * __init scan_one_device(struct device_node *dp, 
			op->archdata.num_irqs = len / sizeof(unsigned int);

			for (i = 0; i < op->archdata.num_irqs; i++)

				op->archdata.irqs[i] =

				    sparc_irq_config.build_device_irq(op, irq[i]);

				    sparc_config.build_device_irq(op, irq[i]);

		} else {

			op->archdata.num_irqs = 0;

		}

arch/sparc/kernel/pcic.c

+1 −1
Original line number Diff line number Diff line
@@ -875,7 +875,7 @@ static void pcic_load_profile_irq(int cpu, unsigned int limit) 


void __init sun4m_pci_init_IRQ(void)

{

	sparc_irq_config.build_device_irq = pcic_build_device_irq;

	sparc_config.build_device_irq = pcic_build_device_irq;



	BTFIXUPSET_CALL(clear_clock_irq, pcic_clear_clock_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(load_profile_irq, pcic_load_profile_irq, BTFIXUPCALL_NORM);