Skip to content

Commit

Permalink
PCI: make isa_bridge Alpha-only
Browse files Browse the repository at this point in the history
Since isa_bridge is neither assigned any value !NULL nor used on !Alpha, 
there's no reason for providing it.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Adrian Bunk authored and Greg Kroah-Hartman committed Feb 7, 2007
1 parent 1863100 commit 8255cf3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 12 deletions.
4 changes: 4 additions & 0 deletions arch/alpha/kernel/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
6 changes: 0 additions & 6 deletions drivers/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions include/asm-alpha/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
6 changes: 0 additions & 6 deletions include/linux/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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) { }
Expand Down

0 comments on commit 8255cf3

Please sign in to comment.