Skip to content

Commit

Permalink
[IA64] remove obsolete irq_desc_t typedef
Browse files Browse the repository at this point in the history
The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t) have
been kept around for migration reasons.  After more than two years it's
time to remove them finally.

This patch cleans up one of the remaining users.  When all such patches
hit mainline we can remove the defines and typedefs finally.

Impact: cleanup

Convert the last remaining users and remove the typedef.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Thomas Gleixner authored and Tony Luck committed Jun 15, 2009
1 parent 8a7c3cd commit 86bc3df
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion arch/ia64/hp/sim/hpsim_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static struct hw_interrupt_type irq_type_hp_sim = {
void __init
hpsim_irq_init (void)
{
irq_desc_t *idesc;
struct irq_desc *idesc;
int i;

for (i = 0; i < NR_IRQS; ++i) {
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/include/asm/hw_irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ static inline void ia64_native_resend_irq(unsigned int vector)
* Default implementations for the irq-descriptor API:
*/

extern irq_desc_t irq_desc[NR_IRQS];
extern struct irq_desc irq_desc[NR_IRQS];

#ifndef CONFIG_IA64_GENERIC
static inline ia64_vector __ia64_irq_to_vector(int irq)
Expand Down
6 changes: 3 additions & 3 deletions arch/ia64/kernel/iosapic.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ iosapic_startup_edge_irq (unsigned int irq)
static void
iosapic_ack_edge_irq (unsigned int irq)
{
irq_desc_t *idesc = irq_desc + irq;
struct irq_desc *idesc = irq_desc + irq;

irq_complete_move(irq);
move_native_irq(irq);
Expand Down Expand Up @@ -600,7 +600,7 @@ static int
register_intr (unsigned int gsi, int irq, unsigned char delivery,
unsigned long polarity, unsigned long trigger)
{
irq_desc_t *idesc;
struct irq_desc *idesc;
struct hw_interrupt_type *irq_type;
int index;
struct iosapic_rte_info *rte;
Expand Down Expand Up @@ -828,7 +828,7 @@ iosapic_unregister_intr (unsigned int gsi)
{
unsigned long flags;
int irq, index;
irq_desc_t *idesc;
struct irq_desc *idesc;
u32 low32;
unsigned long trigger, polarity;
unsigned int dest;
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ unsigned int vectors_in_migration[NR_IRQS];
*/
static void migrate_irqs(void)
{
irq_desc_t *desc;
struct irq_desc *desc;
int irq, new_cpu;

for (irq=0; irq < NR_IRQS; irq++) {
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/irq_ia64.c
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ static struct irqaction tlb_irqaction = {
void
ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action)
{
irq_desc_t *desc;
struct irq_desc *desc;
unsigned int irq;

irq = vec;
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/mca.c
Original file line number Diff line number Diff line change
Expand Up @@ -2093,7 +2093,7 @@ ia64_mca_late_init(void)
cpe_poll_timer.function = ia64_mca_cpe_poll;

{
irq_desc_t *desc;
struct irq_desc *desc;
unsigned int irq;

if (cpe_vector >= 0) {
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/smpboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ extern void fixup_irqs(void);
int migrate_platform_irqs(unsigned int cpu)
{
int new_cpei_cpu;
irq_desc_t *desc = NULL;
struct irq_desc *desc = NULL;
const struct cpumask *mask;
int retval = 0;

Expand Down
4 changes: 2 additions & 2 deletions arch/ia64/sn/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ unsigned int sn_local_vector_to_irq(u8 vector)
void sn_irq_init(void)
{
int i;
irq_desc_t *base_desc = irq_desc;
struct irq_desc *base_desc = irq_desc;

ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR;
ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR;
Expand Down Expand Up @@ -377,7 +377,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
int cpu = nasid_slice_to_cpuid(nasid, slice);
#ifdef CONFIG_SMP
int cpuphys;
irq_desc_t *desc;
struct irq_desc *desc;
#endif

pci_dev_get(pci_dev);
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/xen/irq_xen.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static void
__xen_register_percpu_irq(unsigned int cpu, unsigned int vec,
struct irqaction *action, int save)
{
irq_desc_t *desc;
struct irq_desc *desc;
int irq = 0;

if (xen_slab_ready) {
Expand Down

0 comments on commit 86bc3df

Please sign in to comment.