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

Commit c2e221e8 authored by Linas Vepstas's avatar Linas Vepstas Committed by Paul Mackerras
Browse files

[POWERPC] pseries: asm/pci-bridge.h CONFIG_ minor cleanup 



Use the correct CONFIG_ option to mark off the EEH bits.
Move the EEH bits to the bottom of the struct.
The config_space array is used by EEH only; it does not
need to be part of the struct for non-pseries machines.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>

----
Revised patch, per commments from Michael Ellerman.

 include/asm-powerpc/pci-bridge.h |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3f1df7a2

include/asm-powerpc/pci-bridge.h

+9 −7
Original line number Diff line number Diff line
@@ -70,19 +70,21 @@ struct pci_dn { 
	int	devfn;			/* pci device and function number */

	int	class_code;		/* pci device class */



#ifdef CONFIG_PPC_PSERIES

	struct  pci_controller *phb;	/* for pci devices */

	struct	iommu_table *iommu_table;	/* for phb's or bridges */

	struct	pci_dev *pcidev;	/* back-pointer to the pci device */

	struct	device_node *node;	/* back-pointer to the device_node */



	int	pci_ext_config_space;	/* for pci devices */



#ifdef CONFIG_EEH

	int	eeh_mode;		/* See eeh.h for possible EEH_MODEs */

	int	eeh_config_addr;

	int	eeh_pe_config_addr; /* new-style partition endpoint address */

	int 	eeh_check_count;	/* # times driver ignored error */

	int 	eeh_freeze_count;	/* # times this device froze up. */

#endif

	int	pci_ext_config_space;	/* for pci devices */

	struct  pci_controller *phb;	/* for pci devices */

	struct	iommu_table *iommu_table;	/* for phb's or bridges */

	struct	pci_dev *pcidev;	/* back-pointer to the pci device */

	struct	device_node *node;	/* back-pointer to the device_node */

	u32	config_space[16];	/* saved PCI config space */

#endif

};



/* Get the pointer to a device_node's pci_dn */