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

Commit 10ba1e0e authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Remove irq_2_iommu 



irq_2_iommu is now in the x86 code where it belongs. Remove all
leftovers.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
parent 1a0730d6

include/linux/irq.h

+0 −18
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ typedef void (*irq_flow_handler_t)(unsigned int irq, 
#endif



struct msi_desc;

struct irq_2_iommu;



/**

 * struct irq_data - per irq and irq chip data passed down to chip functions
@@ -97,7 +96,6 @@ struct irq_2_iommu; 
 *			methods, to allow shared chip implementations

 * @msi_desc:		MSI descriptor

 * @affinity:		IRQ affinity on SMP

 * @irq_2_iommu:	iommu with this irq

 *

 * The fields here need to overlay the ones in irq_desc until we

 * cleaned up the direct references and switched everything over to
@@ -113,9 +111,6 @@ struct irq_data { 
#ifdef CONFIG_SMP

	cpumask_var_t		affinity;

#endif

#ifdef CONFIG_INTR_REMAP

	struct irq_2_iommu      *irq_2_iommu;

#endif

};



/**
@@ -389,19 +384,6 @@ static inline struct msi_desc *irq_data_get_msi(struct irq_data *d) 
	return d->msi_desc;

}



#ifdef CONFIG_INTR_REMAP

static inline struct irq_2_iommu *get_irq_iommu(unsigned int irq)

{

	struct irq_data *d = irq_get_irq_data(irq);

	return d ? d->irq_2_iommu : NULL;

}



static inline struct irq_2_iommu *irq_data_get_iommu(struct irq_data *d)

{

	return d->irq_2_iommu;

}

#endif



int irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node);

void irq_free_descs(unsigned int irq, unsigned int cnt);

int irq_reserve_irqs(unsigned int from, unsigned int cnt);

include/linux/irqdesc.h

+0 −4
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


struct proc_dir_entry;

struct timer_rand_state;

struct irq_2_iommu;

/**

 * struct irq_desc - interrupt descriptor

 * @irq_data:		per irq and chip data passed down to chip functions
@@ -52,9 +51,6 @@ struct irq_desc { 
			struct msi_desc		*msi_desc;

#ifdef CONFIG_SMP

			cpumask_var_t		affinity;

#endif

#ifdef CONFIG_INTR_REMAP

			struct irq_2_iommu      *irq_2_iommu;

#endif

		};

	};