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

Commit 08c9388f authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: remove remaining users of btfixup 



Use sparc_config to hold the last two function pointers.  There was no
point generating dedicated _ops structures only for these.

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

arch/sparc/include/asm/leon.h

+0 −4
Original line number Diff line number Diff line
@@ -321,11 +321,7 @@ extern unsigned int leon_build_device_irq(unsigned int real_irq, 
extern void leon_update_virq_handling(unsigned int virq,

			      irq_flow_handler_t flow_handler,

			      const char *name, int do_ack);

extern void leon_clear_clock_irq(void);

extern void leon_load_profile_irq(int cpu, unsigned int limit);

extern void leon_init_timers(void);

extern void leon_clear_clock_irq(void);

extern void leon_load_profile_irq(int cpu, unsigned int limit);

extern void leon_trans_init(struct device_node *dp);

extern void leon_node_init(struct device_node *dp, struct device_node ***nextp);

extern void leon_init_IRQ(void);

arch/sparc/kernel/irq.h

+3 −21
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ struct sparc_config { 


	/* function to obtain offsett for cs period */

	unsigned int (*get_cycles_offset)(void);



	void (*clear_clock_irq)(void);

	void (*load_profile_irq)(int cpu, unsigned int limit);

};

extern struct sparc_config sparc_config;
@@ -78,27 +81,6 @@ void irq_link(unsigned int irq); 
void irq_unlink(unsigned int irq);

void handler_irq(unsigned int pil, struct pt_regs *regs);



/* Dave Redman (djhr@tadpole.co.uk)

 * changed these to function pointers.. it saves cycles and will allow

 * the irq dependencies to be split into different files at a later date

 * sun4m_irq.c etc so we could reduce the kernel size.

 * Jakub Jelinek (jj@sunsite.mff.cuni.cz)

 * Changed these to btfixup entities... It saves cycles :)

 */



BTFIXUPDEF_CALL(void, clear_clock_irq, void)

BTFIXUPDEF_CALL(void, load_profile_irq, int, unsigned int)



static inline void clear_clock_irq(void)

{

	BTFIXUP_CALL(clear_clock_irq)();

}



static inline void load_profile_irq(int cpu, int limit)

{

	BTFIXUP_CALL(load_profile_irq)(cpu, limit);

}



unsigned long leon_get_irqmask(unsigned int irq);



#ifdef CONFIG_SMP

arch/sparc/kernel/leon_kernel.c

+5 −8
Original line number Diff line number Diff line
@@ -463,11 +463,11 @@ void __init leon_init_timers(void) 
	return;

}



void leon_clear_clock_irq(void)

static void leon_clear_clock_irq(void)

{

}



void leon_load_profile_irq(int cpu, unsigned int limit)

static void leon_load_profile_irq(int cpu, unsigned int limit)

{

}
@@ -518,11 +518,8 @@ void __init leon_init_IRQ(void) 
	sparc_config.init_timers      = leon_init_timers;

	sparc_config.build_device_irq = _leon_build_device_irq;

	sparc_config.clock_rate       = 1000000;



	BTFIXUPSET_CALL(clear_clock_irq, leon_clear_clock_irq,

			BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(load_profile_irq, leon_load_profile_irq,

			BTFIXUPCALL_NOP);

	sparc_config.clear_clock_irq  = leon_clear_clock_irq;

	sparc_config.load_profile_irq = leon_load_profile_irq;

}



void __init leon_init(void)

arch/sparc/kernel/pcic.c

+2 −3
Original line number Diff line number Diff line
@@ -880,9 +880,8 @@ static void pcic_load_profile_irq(int cpu, unsigned int limit) 
void __init sun4m_pci_init_IRQ(void)

{

	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);

	sparc_config.clear_clock_irq  = pcic_clear_clock_irq;

	sparc_config.load_profile_irq = pcic_load_profile_irq;

}



int pcibios_assign_resource(struct pci_dev *pdev, int resource)

arch/sparc/kernel/sun4d_irq.c

+2 −3
Original line number Diff line number Diff line
@@ -506,12 +506,11 @@ void __init sun4d_init_IRQ(void) 
{

	local_irq_disable();



	BTFIXUPSET_CALL(clear_clock_irq, sun4d_clear_clock_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(load_profile_irq, sun4d_load_profile_irq, BTFIXUPCALL_NORM);



	sparc_config.init_timers      = sun4d_init_timers;

	sparc_config.build_device_irq = sun4d_build_device_irq;

	sparc_config.clock_rate       = SBUS_CLOCK_RATE;

	sparc_config.clear_clock_irq  = sun4d_clear_clock_irq;

	sparc_config.load_profile_irq = sun4d_load_profile_irq;



	/* Cannot enable interrupts until OBP ticker is disabled. */

}