Commit 015ab17d authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Joerg Roedel
Browse files

intel-iommu: remove some unused struct intel_iommu fields 



The seg, saved_msg and sysdev fields appear to be unused since
before the code was first merged.

linux/msi.h is not needed in linux/intel-iommu.h anymore since
there is no longer a reference to struct msi_msg. The MSI code
in drivers/pci/intel-iommu.c still has linux/msi.h included
via linux/dmar.h.

linux/sysdev.h isn't needed because there is no reference to
struct sys_device.

Signed-off-by: default avatarMark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 6680598b

drivers/pci/intel-iommu.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/slab.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/sysdev.h>

#include <linux/spinlock.h>

#include <linux/pci.h>

#include <linux/dmar.h>

include/linux/intel-iommu.h

+0 −5
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#define _INTEL_IOMMU_H_



#include <linux/types.h>

#include <linux/msi.h>

#include <linux/sysdev.h>

#include <linux/iova.h>

#include <linux/io.h>

#include <linux/dma_remapping.h>
@@ -289,7 +287,6 @@ struct intel_iommu { 
	void __iomem	*reg; /* Pointer to hardware regs, virtual addr */

	u64		cap;

	u64		ecap;

	int		seg;

	u32		gcmd; /* Holds TE, EAFL. Don't need SRTP, SFL, WBF */

	spinlock_t	register_lock; /* protect register handling */

	int		seq_id;	/* sequence id of the iommu */
@@ -302,8 +299,6 @@ struct intel_iommu { 


	unsigned int irq;

	unsigned char name[7];    /* Device Name */

	struct msi_msg saved_msg;

	struct sys_device sysdev;

	struct iommu_flush flush;

#endif

	struct q_inval  *qi;            /* Queued invalidation info */

CRA Git | Maintained and supported by SUSTech CRA and CCSE