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

Commit a699e4e4 authored by Grant Likely's avatar Grant Likely
Browse files

irq: Kill pointless irqd_to_hw export 



It makes no sense to export this trivial function.  Make it a static inline
instead.

This patch also drops virq_to_hw from arch/c6x since it is unused by that
architecture.

v2: Move irq_hw_number_t into types.h to fix ARM build failure

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
parent 5b7526e3

arch/c6x/include/asm/irq.h

+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ 
/* This number is used when no interrupt has been assigned */

#define NO_IRQ		0



struct irq_data;

extern irq_hw_number_t irqd_to_hwirq(struct irq_data *d);

extern irq_hw_number_t virq_to_hw(unsigned int virq);



extern void __init init_pic_c64xplus(void);



extern void init_IRQ(void);

arch/c6x/kernel/irq.c

+0 −13
Original line number Diff line number Diff line
@@ -130,16 +130,3 @@ int arch_show_interrupts(struct seq_file *p, int prec) 
	seq_printf(p, "%*s: %10lu\n", prec, "Err", irq_err_count);

	return 0;

}
 


irq_hw_number_t irqd_to_hwirq(struct irq_data *d)

{

	return d->hwirq;

}

EXPORT_SYMBOL_GPL(irqd_to_hwirq);



irq_hw_number_t virq_to_hw(unsigned int virq)

{

	struct irq_data *irq_data = irq_get_irq_data(virq);

	return WARN_ON(!irq_data) ? 0 : irq_data->hwirq;

}

EXPORT_SYMBOL_GPL(virq_to_hw);

arch/powerpc/include/asm/irq.h

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ extern atomic_t ppc_n_lost_interrupts; 
/* Same thing, used by the generic IRQ code */

#define NR_IRQS_LEGACY		NUM_ISA_INTERRUPTS



struct irq_data;

extern irq_hw_number_t irqd_to_hwirq(struct irq_data *d);

extern irq_hw_number_t virq_to_hw(unsigned int virq);



/**

arch/powerpc/kernel/irq.c

+0 −6
Original line number Diff line number Diff line
@@ -560,12 +560,6 @@ void do_softirq(void) 
	local_irq_restore(flags);

}



irq_hw_number_t irqd_to_hwirq(struct irq_data *d)

{

	return d->hwirq;

}

EXPORT_SYMBOL_GPL(irqd_to_hwirq);



irq_hw_number_t virq_to_hw(unsigned int virq)

{

	struct irq_data *irq_data = irq_get_irq_data(virq);

include/linux/irq.h

+5 −0
Original line number Diff line number Diff line
@@ -263,6 +263,11 @@ static inline void irqd_clr_chained_irq_inprogress(struct irq_data *d) 
	d->state_use_accessors &= ~IRQD_IRQ_INPROGRESS;

}



static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d)

{

	return d->hwirq;

}



/**

 * struct irq_chip - hardware interrupt chip descriptor

 *