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

Commit c6387a48 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC]: Kill __irq_itoa(). 



This ugly hack was long overdue to die.

It was a way to print out Sparc interrupts in a more freindly format,
since IRQ numbers were arbitrary opaque 32-bit integers which vectored
into PIL levels.  These 32-bit integers were not necessarily in the
0-->NR_IRQS range, but the PILs they vectored to were.

The idea now is that we will increase NR_IRQS a little bit and use a
virtual<-->real IRQ number mapping scheme similar to PowerPC.

That makes this IRQ printing hack irrelevant, and furthermore only a
handful of drivers actually used __irq_itoa() making it even less
useful.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a76267f

arch/sparc/kernel/pcic.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -896,13 +896,6 @@ static inline unsigned long get_irqmask(int irq_nr) 
	return 1 << irq_nr;

	return 1 << irq_nr;

}

}





static inline char *pcic_irq_itoa(unsigned int irq)

{

	static char buff[16];

	sprintf(buff, "%d", irq);

	return buff;

}



static void pcic_disable_irq(unsigned int irq_nr)

static void pcic_disable_irq(unsigned int irq_nr)

{

{

	unsigned long mask, flags;

	unsigned long mask, flags;
@@ -955,7 +948,6 @@ void __init sun4m_pci_init_IRQ(void) 
	BTFIXUPSET_CALL(clear_clock_irq, pcic_clear_clock_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_clock_irq, pcic_clear_clock_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_profile_irq, pcic_clear_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_profile_irq, pcic_clear_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(load_profile_irq, pcic_load_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(load_profile_irq, pcic_load_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(__irq_itoa, pcic_irq_itoa, BTFIXUPCALL_NORM);

}

}





int pcibios_assign_resource(struct pci_dev *pdev, int resource)

int pcibios_assign_resource(struct pci_dev *pdev, int resource)

arch/sparc/kernel/sparc_ksyms.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -163,7 +163,6 @@ EXPORT_SYMBOL(BTFIXUP_CALL(__hard_smp_processor_id)); 
#endif

#endif

EXPORT_SYMBOL(BTFIXUP_CALL(enable_irq));

EXPORT_SYMBOL(BTFIXUP_CALL(enable_irq));

EXPORT_SYMBOL(BTFIXUP_CALL(disable_irq));

EXPORT_SYMBOL(BTFIXUP_CALL(disable_irq));

EXPORT_SYMBOL(BTFIXUP_CALL(__irq_itoa));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_unlockarea));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_unlockarea));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_lockarea));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_lockarea));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_sgl));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_sgl));

arch/sparc/kernel/sun4c_irq.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -198,8 +198,6 @@ static void __init sun4c_init_timers(irqreturn_t (*counter_fn)(int, void *, stru 
static void sun4c_nop(void) {}

static void sun4c_nop(void) {}

#endif

#endif





extern char *sun4m_irq_itoa(unsigned int irq);



void __init sun4c_init_IRQ(void)

void __init sun4c_init_IRQ(void)

{

{

	struct linux_prom_registers int_regs[2];

	struct linux_prom_registers int_regs[2];
@@ -238,7 +236,6 @@ void __init sun4c_init_IRQ(void) 
	BTFIXUPSET_CALL(clear_clock_irq, sun4c_clear_clock_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_clock_irq, sun4c_clear_clock_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq, BTFIXUPCALL_NOP);

	BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq, BTFIXUPCALL_NOP);

	BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP);

	BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP);

	BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM);

	sparc_init_timers = sun4c_init_timers;

	sparc_init_timers = sun4c_init_timers;

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);

	BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);

arch/sparc/kernel/sun4d_irq.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -560,17 +560,6 @@ void __init sun4d_init_sbi_irq(void) 
	}

	}

}

}





static char *sun4d_irq_itoa(unsigned int irq)

{

	static char buff[16];

	

	if (irq < (1 << 5))

		sprintf(buff, "%d", irq);

	else

		sprintf(buff, "%d,%x", sbus_to_pil[(irq >> 2) & 7], irq);

	return buff;

}



void __init sun4d_init_IRQ(void)

void __init sun4d_init_IRQ(void)

{

{

	local_irq_disable();

	local_irq_disable();
@@ -581,7 +570,6 @@ void __init sun4d_init_IRQ(void) 
	BTFIXUPSET_CALL(clear_clock_irq, sun4d_clear_clock_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_clock_irq, sun4d_clear_clock_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_profile_irq, sun4d_clear_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_profile_irq, sun4d_clear_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(load_profile_irq, sun4d_load_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(load_profile_irq, sun4d_load_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(__irq_itoa, sun4d_irq_itoa, BTFIXUPCALL_NORM);

	sparc_init_timers = sun4d_init_timers;

	sparc_init_timers = sun4d_init_timers;

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	BTFIXUPSET_CALL(set_cpu_int, sun4d_set_cpu_int, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(set_cpu_int, sun4d_set_cpu_int, BTFIXUPCALL_NORM);

arch/sparc/kernel/sun4m_irq.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -229,13 +229,6 @@ static void sun4m_load_profile_irq(int cpu, unsigned int limit) 
	sun4m_timers->cpu_timers[cpu].l14_timer_limit = limit;

	sun4m_timers->cpu_timers[cpu].l14_timer_limit = limit;

}

}





char *sun4m_irq_itoa(unsigned int irq)

{

	static char buff[16];

	sprintf(buff, "%d", irq);

	return buff;

}



static void __init sun4m_init_timers(irqreturn_t (*counter_fn)(int, void *, struct pt_regs *))

static void __init sun4m_init_timers(irqreturn_t (*counter_fn)(int, void *, struct pt_regs *))

{

{

	int reg_count, irq, cpu;

	int reg_count, irq, cpu;
@@ -388,7 +381,6 @@ void __init sun4m_init_IRQ(void) 
	BTFIXUPSET_CALL(clear_clock_irq, sun4m_clear_clock_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_clock_irq, sun4m_clear_clock_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_profile_irq, sun4m_clear_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(clear_profile_irq, sun4m_clear_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM);

	sparc_init_timers = sun4m_init_timers;

	sparc_init_timers = sun4m_init_timers;

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM);