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

Commit 8255cf35 authored by Adrian Bunk's avatar Adrian Bunk Committed by Greg Kroah-Hartman
Browse files

PCI: make isa_bridge Alpha-only 



Since isa_bridge is neither assigned any value !NULL nor used on !Alpha, 
there's no reason for providing it.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1863100a

arch/alpha/kernel/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -575,3 +575,7 @@ void pci_iounmap(struct pci_dev *dev, void __iomem * addr) 


EXPORT_SYMBOL(pci_iomap);

EXPORT_SYMBOL(pci_iounmap);



/* FIXME: Some boxes have multiple ISA bridges! */

struct pci_dev *isa_bridge;

EXPORT_SYMBOL(isa_bridge);

drivers/pci/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -1224,12 +1224,6 @@ early_param("pci", pci_setup); 


device_initcall(pci_init);



#if defined(CONFIG_ISA) || defined(CONFIG_EISA)

/* FIXME: Some boxes have multiple ISA bridges! */

struct pci_dev *isa_bridge;

EXPORT_SYMBOL(isa_bridge);

#endif



EXPORT_SYMBOL_GPL(pci_restore_bars);

EXPORT_SYMBOL(pci_enable_device_bars);

EXPORT_SYMBOL(pci_enable_device);

include/asm-alpha/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -293,4 +293,6 @@ struct pci_dev *alpha_gendev_to_pci(struct device *dev); 
#define IOBASE_ROOT_BUS		5

#define IOBASE_FROM_HOSE	0x10000



extern struct pci_dev *isa_bridge;



#endif /* __ALPHA_PCI_H */

include/linux/pci.h

+0 −6
Original line number Diff line number Diff line
@@ -618,10 +618,6 @@ enum pci_dma_burst_strategy { 
				   strategy_parameter byte boundaries */

};



#if defined(CONFIG_ISA) || defined(CONFIG_EISA)

extern struct pci_dev *isa_bridge;

#endif



struct msix_entry {

	u16 	vector;	/* kernel uses to write allocated vector */

	u16	entry;	/* driver uses to specify entry, OS writes */
@@ -729,8 +725,6 @@ static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state) { 
static inline pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) { return PCI_D0; }

static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable) { return 0; }



#define	isa_bridge	((struct pci_dev *)NULL)



#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)



static inline void pci_block_user_cfg_access(struct pci_dev *dev) { }