tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

PCI: Remove includes of asm/pci-bridge.h

Drivers should include asm/pci-bridge.h only when they need the arch-
specific things provided there. Outside of the arch/ directories, the only
drivers that actually need things provided by asm/pci-bridge.h are the
powerpc RPA hotplug drivers in drivers/pci/hotplug/rpa*.

Remove the includes of asm/pci-bridge.h from the other drivers, adding an
include of linux/pci.h if necessary.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Bjorn Helgaas 952bbcb0 b6b83f7f

+3 -21
+1 -1
drivers/ata/pata_macio.c
··· 22 22 #include <linux/scatterlist.h> 23 23 #include <linux/of.h> 24 24 #include <linux/gfp.h> 25 + #include <linux/pci.h> 25 26 26 27 #include <scsi/scsi.h> 27 28 #include <scsi/scsi_host.h> ··· 31 30 #include <asm/macio.h> 32 31 #include <asm/io.h> 33 32 #include <asm/dbdma.h> 34 - #include <asm/pci-bridge.h> 35 33 #include <asm/machdep.h> 36 34 #include <asm/pmac_feature.h> 37 35 #include <asm/mediabay.h>
-1
drivers/char/agp/uninorth-agp.c
··· 10 10 #include <linux/delay.h> 11 11 #include <linux/vmalloc.h> 12 12 #include <asm/uninorth.h> 13 - #include <asm/pci-bridge.h> 14 13 #include <asm/prom.h> 15 14 #include <asm/pmac_feature.h> 16 15 #include "agp.h"
-1
drivers/gpu/drm/radeon/radeon_combios.c
··· 34 34 #include <asm/machdep.h> 35 35 #include <asm/pmac_feature.h> 36 36 #include <asm/prom.h> 37 - #include <asm/pci-bridge.h> 38 37 #endif /* CONFIG_PPC_PMAC */ 39 38 40 39 /* from radeon_legacy_encoder.c */
-1
drivers/ide/pdc202xx_new.c
··· 28 28 29 29 #ifdef CONFIG_PPC_PMAC 30 30 #include <asm/prom.h> 31 - #include <asm/pci-bridge.h> 32 31 #endif 33 32 34 33 #define DRV_NAME "pdc202xx_new"
-1
drivers/ide/pmac.c
··· 40 40 #include <asm/io.h> 41 41 #include <asm/dbdma.h> 42 42 #include <asm/ide.h> 43 - #include <asm/pci-bridge.h> 44 43 #include <asm/machdep.h> 45 44 #include <asm/pmac_feature.h> 46 45 #include <asm/sections.h>
-1
drivers/macintosh/macio_asic.c
··· 31 31 #include <asm/macio.h> 32 32 #include <asm/pmac_feature.h> 33 33 #include <asm/prom.h> 34 - #include <asm/pci-bridge.h> 35 34 36 35 #undef DEBUG 37 36
-1
drivers/misc/cxl/pci.c
··· 19 19 #include <linux/delay.h> 20 20 #include <asm/opal.h> 21 21 #include <asm/msi_bitmap.h> 22 - #include <asm/pci-bridge.h> /* for struct pci_controller */ 23 22 #include <asm/pnv-pci.h> 24 23 #include <asm/io.h> 25 24
-1
drivers/net/ethernet/sun/sungem.c
··· 51 51 #endif 52 52 53 53 #ifdef CONFIG_PPC_PMAC 54 - #include <asm/pci-bridge.h> 55 54 #include <asm/prom.h> 56 55 #include <asm/machdep.h> 57 56 #include <asm/pmac_feature.h>
-1
drivers/net/ethernet/toshiba/spider_net.c
··· 48 48 #include <linux/wait.h> 49 49 #include <linux/workqueue.h> 50 50 #include <linux/bitops.h> 51 - #include <asm/pci-bridge.h> 52 51 #include <net/checksum.h> 53 52 54 53 #include "spider_net.h"
+1 -1
drivers/scsi/mac53c94.c
··· 18 18 #include <linux/spinlock.h> 19 19 #include <linux/interrupt.h> 20 20 #include <linux/module.h> 21 + #include <linux/pci.h> 21 22 #include <asm/dbdma.h> 22 23 #include <asm/io.h> 23 24 #include <asm/pgtable.h> 24 25 #include <asm/prom.h> 25 - #include <asm/pci-bridge.h> 26 26 #include <asm/macio.h> 27 27 28 28 #include <scsi/scsi.h>
+1 -1
drivers/scsi/mesh.c
··· 29 29 #include <linux/interrupt.h> 30 30 #include <linux/reboot.h> 31 31 #include <linux/spinlock.h> 32 + #include <linux/pci.h> 32 33 #include <asm/dbdma.h> 33 34 #include <asm/io.h> 34 35 #include <asm/pgtable.h> ··· 39 38 #include <asm/processor.h> 40 39 #include <asm/machdep.h> 41 40 #include <asm/pmac_feature.h> 42 - #include <asm/pci-bridge.h> 43 41 #include <asm/macio.h> 44 42 45 43 #include <scsi/scsi.h>
-1
drivers/usb/core/hcd-pci.c
··· 28 28 #ifdef CONFIG_PPC_PMAC 29 29 #include <asm/machdep.h> 30 30 #include <asm/pmac_feature.h> 31 - #include <asm/pci-bridge.h> 32 31 #include <asm/prom.h> 33 32 #endif 34 33
-1
drivers/video/fbdev/aty/aty128fb.c
··· 68 68 #include <asm/machdep.h> 69 69 #include <asm/pmac_feature.h> 70 70 #include <asm/prom.h> 71 - #include <asm/pci-bridge.h> 72 71 #include "../macmodes.h" 73 72 #endif 74 73
-1
drivers/video/fbdev/aty/radeon_base.c
··· 76 76 77 77 #ifdef CONFIG_PPC 78 78 79 - #include <asm/pci-bridge.h> 80 79 #include "../macmodes.h" 81 80 82 81 #ifdef CONFIG_BOOTX_TEXT
-1
drivers/video/fbdev/imsttfb.c
··· 33 33 #if defined(CONFIG_PPC) 34 34 #include <linux/nvram.h> 35 35 #include <asm/prom.h> 36 - #include <asm/pci-bridge.h> 37 36 #include "macmodes.h" 38 37 #endif 39 38
-1
drivers/video/fbdev/matrox/matroxfb_base.h
··· 47 47 48 48 #if defined(CONFIG_PPC_PMAC) 49 49 #include <asm/prom.h> 50 - #include <asm/pci-bridge.h> 51 50 #include "../macmodes.h" 52 51 #endif 53 52
-4
drivers/video/fbdev/offb.c
··· 28 28 #include <linux/pci.h> 29 29 #include <asm/io.h> 30 30 31 - #ifdef CONFIG_PPC64 32 - #include <asm/pci-bridge.h> 33 - #endif 34 - 35 31 #ifdef CONFIG_PPC32 36 32 #include <asm/bootx.h> 37 33 #endif
-1
sound/ppc/pmac.c
··· 34 34 #include "pmac.h" 35 35 #include <sound/pcm_params.h> 36 36 #include <asm/pmac_feature.h> 37 - #include <asm/pci-bridge.h> 38 37 39 38 40 39 /* fixed frequency table for awacs, screamer, burgundy, DACA (44100 max) */