* [PATCH 0/7] Cleanup unused code
@ 2015-06-04 21:49 Bjorn Helgaas
2015-06-04 21:49 ` [PATCH 1/7] microblaze/PCI: Remove unused declarations Bjorn Helgaas
` (6 more replies)
0 siblings, 7 replies; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-04 21:49 UTC (permalink / raw)
To: linux-pci
These patches:
- Remove some unnecessary declarations
- Include <linux/pci.h> instead of <asm/pci.h>
- Remove some unnecessary includes of <asm/pci.h>
- Remove some unused code
They touch a lot of arches but are trivial, so I propose to merge them all
via my PCI tree.
---
Bjorn Helgaas (7):
microblaze/PCI: Remove unused declarations
microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration
microblaze/PCI: Remove unnecessary struct pci_dev declaration
PCI: Include <linux/pci.h>, not <asm/pci.h>
PCI: Remove unnecessary #includes of <asm/pci.h>
PCI: Remove unused pcibios_select_root() (again)
PCI: Remove unused pci_dma_burst_advice()
arch/alpha/include/asm/pci.h | 16 ------------
arch/alpha/kernel/core_irongate.c | 1 -
arch/alpha/kernel/sys_eiger.c | 1 -
arch/alpha/kernel/sys_nautilus.c | 1 -
arch/arm/include/asm/pci.h | 10 -------
arch/frv/include/asm/pci.h | 10 -------
arch/ia64/include/asm/pci.h | 32 -----------------------
arch/microblaze/include/asm/pci.h | 40 -----------------------------
arch/mips/include/asm/pci.h | 10 -------
arch/mips/pci/fixup-cobalt.c | 1 -
arch/mips/pci/ops-mace.c | 1 -
arch/mips/pci/pci-lantiq.c | 1 -
arch/mn10300/include/asm/pci.h | 13 ---------
arch/parisc/include/asm/pci.h | 19 --------------
arch/powerpc/include/asm/pci.h | 30 ----------------------
arch/powerpc/kernel/prom.c | 1 -
arch/powerpc/kernel/prom_init.c | 1 -
arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +
arch/s390/kernel/suspend.c | 2 +
arch/sh/drivers/pci/ops-sh5.c | 1 -
arch/sh/drivers/pci/pci-sh5.c | 1 -
arch/sh/include/asm/pci.h | 18 -------------
arch/sparc/include/asm/pci_32.h | 10 -------
arch/sparc/include/asm/pci_64.h | 19 --------------
arch/unicore32/include/asm/pci.h | 10 -------
arch/x86/include/asm/pci.h | 7 -----
arch/x86/kernel/x86_init.c | 1 -
drivers/net/ethernet/sun/cassini.c | 1 -
include/asm-generic/pci.h | 13 ---------
include/linux/pci.h | 11 --------
30 files changed, 2 insertions(+), 282 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/7] microblaze/PCI: Remove unused declarations
2015-06-04 21:49 [PATCH 0/7] Cleanup unused code Bjorn Helgaas
@ 2015-06-04 21:49 ` Bjorn Helgaas
2015-06-05 7:07 ` Michal Simek
2015-06-04 21:49 ` [PATCH 2/7] microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration Bjorn Helgaas
` (5 subsequent siblings)
6 siblings, 1 reply; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-04 21:49 UTC (permalink / raw)
To: linux-pci; +Cc: Michal Simek
The following declarations were copied from powerpc but are unused on
microblaze:
struct pci_controller *init_phb_dynamic(struct device_node *dn)
int remove_phb_dynamic(struct pci_controller *phb)
struct pci_dev *of_create_pci_dev(struct device_node *node, ...)
void of_scan_pci_bridge(struct device_node *node, ...)
void of_scan_bus(struct device_node *node, struct pci_bus *bus)
void of_rescan_bus(struct device_node *node, struct pci_bus *bus)
Remove them.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Michal Simek <monstr@monstr.eu>
---
arch/microblaze/include/asm/pci.h | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index 468aca8..b6b5b3c 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -102,18 +102,6 @@ extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
extern void pcibios_resource_survey(void);
-extern struct pci_controller *init_phb_dynamic(struct device_node *dn);
-extern int remove_phb_dynamic(struct pci_controller *phb);
-
-extern struct pci_dev *of_create_pci_dev(struct device_node *node,
- struct pci_bus *bus, int devfn);
-
-extern void of_scan_pci_bridge(struct device_node *node,
- struct pci_dev *dev);
-
-extern void of_scan_bus(struct device_node *node, struct pci_bus *bus);
-extern void of_rescan_bus(struct device_node *node, struct pci_bus *bus);
-
extern int pci_bus_find_capability(struct pci_bus *bus,
unsigned int devfn, int cap);
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 2/7] microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration
2015-06-04 21:49 [PATCH 0/7] Cleanup unused code Bjorn Helgaas
2015-06-04 21:49 ` [PATCH 1/7] microblaze/PCI: Remove unused declarations Bjorn Helgaas
@ 2015-06-04 21:49 ` Bjorn Helgaas
2015-06-05 7:07 ` Michal Simek
2015-06-04 21:49 ` [PATCH 3/7] microblaze/PCI: Remove unnecessary struct pci_dev declaration Bjorn Helgaas
` (4 subsequent siblings)
6 siblings, 1 reply; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-04 21:49 UTC (permalink / raw)
To: linux-pci; +Cc: Michal Simek
pci_bus_find_capability() is declared in include/linux/pci.h.
Remove the pci_bus_find_capability() declaration from
arch/microblaze/include/asm/pci.h.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Michal Simek <monstr@monstr.eu>
---
arch/microblaze/include/asm/pci.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index b6b5b3c..541400d 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -102,9 +102,6 @@ extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
extern void pcibios_resource_survey(void);
-extern int pci_bus_find_capability(struct pci_bus *bus,
- unsigned int devfn, int cap);
-
struct file;
extern pgprot_t pci_phys_mem_access_prot(struct file *file,
unsigned long pfn,
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 3/7] microblaze/PCI: Remove unnecessary struct pci_dev declaration
2015-06-04 21:49 [PATCH 0/7] Cleanup unused code Bjorn Helgaas
2015-06-04 21:49 ` [PATCH 1/7] microblaze/PCI: Remove unused declarations Bjorn Helgaas
2015-06-04 21:49 ` [PATCH 2/7] microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration Bjorn Helgaas
@ 2015-06-04 21:49 ` Bjorn Helgaas
2015-06-05 7:07 ` Michal Simek
2015-06-04 21:49 ` [PATCH 4/7] PCI: Include <linux/pci.h>, not <asm/pci.h> Bjorn Helgaas
` (3 subsequent siblings)
6 siblings, 1 reply; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-04 21:49 UTC (permalink / raw)
To: linux-pci; +Cc: Michal Simek
All users of arch/microblaze/include/asm/pci.h get it by including
include/linux/pci.h, which in turn includes <asm/pci.h> after it declares
struct pci_dev.
The forward declaration here is unnecessary, so remove it.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Michal Simek <monstr@monstr.eu>
---
arch/microblaze/include/asm/pci.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index 541400d..67224d3 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -27,8 +27,6 @@
#define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM 0x10000000
-struct pci_dev;
-
/* Values for the `which' argument to sys_pciconfig_iobase syscall. */
#define IOBASE_BRIDGE_NUMBER 0
#define IOBASE_MEMORY 1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 4/7] PCI: Include <linux/pci.h>, not <asm/pci.h>
2015-06-04 21:49 [PATCH 0/7] Cleanup unused code Bjorn Helgaas
` (2 preceding siblings ...)
2015-06-04 21:49 ` [PATCH 3/7] microblaze/PCI: Remove unnecessary struct pci_dev declaration Bjorn Helgaas
@ 2015-06-04 21:49 ` Bjorn Helgaas
2015-06-04 21:49 ` Bjorn Helgaas
` (2 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-04 21:49 UTC (permalink / raw)
To: linux-pci; +Cc: linux-s390, linuxppc-dev
We already include <asm/pci.h> from <linux/pci.h>, so just include
<linux/pci.h> directly.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: linuxppc-dev@lists.ozlabs.org
CC: linux-s390@vger.kernel.org
---
arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +-
arch/s390/kernel/suspend.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index e2d401a..6eb3b2a 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -12,7 +12,7 @@
#undef DEBUG
-#include <asm/pci.h>
+#include <linux/pci.h>
#include <asm/mpc52xx.h>
#include <asm/delay.h>
#include <asm/machdep.h>
diff --git a/arch/s390/kernel/suspend.c b/arch/s390/kernel/suspend.c
index d3236c9..39e2f41 100644
--- a/arch/s390/kernel/suspend.c
+++ b/arch/s390/kernel/suspend.c
@@ -9,10 +9,10 @@
#include <linux/pfn.h>
#include <linux/suspend.h>
#include <linux/mm.h>
+#include <linux/pci.h>
#include <asm/ctl_reg.h>
#include <asm/ipl.h>
#include <asm/cio.h>
-#include <asm/pci.h>
#include <asm/sections.h>
#include "entry.h"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 5/7] PCI: Remove unnecessary #includes of <asm/pci.h>
2015-06-04 21:49 [PATCH 0/7] Cleanup unused code Bjorn Helgaas
@ 2015-06-04 21:49 ` Bjorn Helgaas
2015-06-04 21:49 ` [PATCH 2/7] microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration Bjorn Helgaas
` (5 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-04 21:49 UTC (permalink / raw)
To: linux-pci; +Cc: linux-mips, linux-sh, linuxppc-dev, x86, linux-alpha
In include/linux/pci.h, we already #include <asm/pci.h>, so we don't need
to include <asm/pci.h> directly.
Remove the unnecessary includes. All the files here already include
<linux/pci.h>.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: linux-alpha@vger.kernel.org
CC: linux-mips@linux-mips.org
CC: linuxppc-dev@lists.ozlabs.org
CC: linux-sh@vger.kernel.org
CC: x86@kernel.org
---
arch/alpha/kernel/core_irongate.c | 1 -
arch/alpha/kernel/sys_eiger.c | 1 -
arch/alpha/kernel/sys_nautilus.c | 1 -
arch/mips/pci/fixup-cobalt.c | 1 -
arch/mips/pci/ops-mace.c | 1 -
arch/mips/pci/pci-lantiq.c | 1 -
arch/powerpc/kernel/prom.c | 1 -
arch/powerpc/kernel/prom_init.c | 1 -
arch/sh/drivers/pci/ops-sh5.c | 1 -
arch/sh/drivers/pci/pci-sh5.c | 1 -
arch/x86/kernel/x86_init.c | 1 -
11 files changed, 11 deletions(-)
diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c
index 00096df..83d0a35 100644
--- a/arch/alpha/kernel/core_irongate.c
+++ b/arch/alpha/kernel/core_irongate.c
@@ -22,7 +22,6 @@
#include <linux/bootmem.h>
#include <asm/ptrace.h>
-#include <asm/pci.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
diff --git a/arch/alpha/kernel/sys_eiger.c b/arch/alpha/kernel/sys_eiger.c
index 79d69d7..15f4208 100644
--- a/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
@@ -22,7 +22,6 @@
#include <asm/irq.h>
#include <asm/mmu_context.h>
#include <asm/io.h>
-#include <asm/pci.h>
#include <asm/pgtable.h>
#include <asm/core_tsunami.h>
#include <asm/hwrpb.h>
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 700686d..2cfaa0e 100644
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -39,7 +39,6 @@
#include <asm/irq.h>
#include <asm/mmu_context.h>
#include <asm/io.h>
-#include <asm/pci.h>
#include <asm/pgtable.h>
#include <asm/core_irongate.h>
#include <asm/hwrpb.h>
diff --git a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c
index a138e8e..b3ab593 100644
--- a/arch/mips/pci/fixup-cobalt.c
+++ b/arch/mips/pci/fixup-cobalt.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/pci.h>
#include <asm/io.h>
#include <asm/gt64120.h>
diff --git a/arch/mips/pci/ops-mace.c b/arch/mips/pci/ops-mace.c
index 6b5821f..951d807 100644
--- a/arch/mips/pci/ops-mace.c
+++ b/arch/mips/pci/ops-mace.c
@@ -8,7 +8,6 @@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/types.h>
-#include <asm/pci.h>
#include <asm/ip32/mace.h>
#if 0
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
index 8b117e6..c5347d9 100644
--- a/arch/mips/pci/pci-lantiq.c
+++ b/arch/mips/pci/pci-lantiq.c
@@ -20,7 +20,6 @@
#include <linux/of_irq.h>
#include <linux/of_pci.h>
-#include <asm/pci.h>
#include <asm/gpio.h>
#include <asm/addrspace.h>
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 308c5e1..00fdea2 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -46,7 +46,6 @@
#include <asm/mmu.h>
#include <asm/paca.h>
#include <asm/pgtable.h>
-#include <asm/pci.h>
#include <asm/iommu.h>
#include <asm/btext.h>
#include <asm/sections.h>
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index fd1fe4c..fcca807 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -37,7 +37,6 @@
#include <asm/smp.h>
#include <asm/mmu.h>
#include <asm/pgtable.h>
-#include <asm/pci.h>
#include <asm/iommu.h>
#include <asm/btext.h>
#include <asm/sections.h>
diff --git a/arch/sh/drivers/pci/ops-sh5.c b/arch/sh/drivers/pci/ops-sh5.c
index 4ce95a0..4536194 100644
--- a/arch/sh/drivers/pci/ops-sh5.c
+++ b/arch/sh/drivers/pci/ops-sh5.c
@@ -18,7 +18,6 @@
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/irq.h>
-#include <asm/pci.h>
#include <asm/io.h>
#include "pci-sh5.h"
diff --git a/arch/sh/drivers/pci/pci-sh5.c b/arch/sh/drivers/pci/pci-sh5.c
index 16c1e72..8229114 100644
--- a/arch/sh/drivers/pci/pci-sh5.c
+++ b/arch/sh/drivers/pci/pci-sh5.c
@@ -20,7 +20,6 @@
#include <linux/types.h>
#include <linux/irq.h>
#include <cpu/irq.h>
-#include <asm/pci.h>
#include <asm/io.h>
#include "pci-sh5.h"
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 234b072..eed5625 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -11,7 +11,6 @@
#include <asm/bios_ebda.h>
#include <asm/paravirt.h>
#include <asm/pci_x86.h>
-#include <asm/pci.h>
#include <asm/mpspec.h>
#include <asm/setup.h>
#include <asm/apic.h>
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 5/7] PCI: Remove unnecessary #includes of <asm/pci.h>
@ 2015-06-04 21:49 ` Bjorn Helgaas
0 siblings, 0 replies; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-04 21:49 UTC (permalink / raw)
To: linux-pci; +Cc: linux-mips, linux-sh, linuxppc-dev, x86, linux-alpha
In include/linux/pci.h, we already #include <asm/pci.h>, so we don't need
to include <asm/pci.h> directly.
Remove the unnecessary includes. All the files here already include
<linux/pci.h>.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: linux-alpha@vger.kernel.org
CC: linux-mips@linux-mips.org
CC: linuxppc-dev@lists.ozlabs.org
CC: linux-sh@vger.kernel.org
CC: x86@kernel.org
---
arch/alpha/kernel/core_irongate.c | 1 -
arch/alpha/kernel/sys_eiger.c | 1 -
arch/alpha/kernel/sys_nautilus.c | 1 -
arch/mips/pci/fixup-cobalt.c | 1 -
arch/mips/pci/ops-mace.c | 1 -
arch/mips/pci/pci-lantiq.c | 1 -
arch/powerpc/kernel/prom.c | 1 -
arch/powerpc/kernel/prom_init.c | 1 -
arch/sh/drivers/pci/ops-sh5.c | 1 -
arch/sh/drivers/pci/pci-sh5.c | 1 -
arch/x86/kernel/x86_init.c | 1 -
11 files changed, 11 deletions(-)
diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c
index 00096df..83d0a35 100644
--- a/arch/alpha/kernel/core_irongate.c
+++ b/arch/alpha/kernel/core_irongate.c
@@ -22,7 +22,6 @@
#include <linux/bootmem.h>
#include <asm/ptrace.h>
-#include <asm/pci.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
diff --git a/arch/alpha/kernel/sys_eiger.c b/arch/alpha/kernel/sys_eiger.c
index 79d69d7..15f4208 100644
--- a/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
@@ -22,7 +22,6 @@
#include <asm/irq.h>
#include <asm/mmu_context.h>
#include <asm/io.h>
-#include <asm/pci.h>
#include <asm/pgtable.h>
#include <asm/core_tsunami.h>
#include <asm/hwrpb.h>
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 700686d..2cfaa0e 100644
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -39,7 +39,6 @@
#include <asm/irq.h>
#include <asm/mmu_context.h>
#include <asm/io.h>
-#include <asm/pci.h>
#include <asm/pgtable.h>
#include <asm/core_irongate.h>
#include <asm/hwrpb.h>
diff --git a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c
index a138e8e..b3ab593 100644
--- a/arch/mips/pci/fixup-cobalt.c
+++ b/arch/mips/pci/fixup-cobalt.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/pci.h>
#include <asm/io.h>
#include <asm/gt64120.h>
diff --git a/arch/mips/pci/ops-mace.c b/arch/mips/pci/ops-mace.c
index 6b5821f..951d807 100644
--- a/arch/mips/pci/ops-mace.c
+++ b/arch/mips/pci/ops-mace.c
@@ -8,7 +8,6 @@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/types.h>
-#include <asm/pci.h>
#include <asm/ip32/mace.h>
#if 0
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
index 8b117e6..c5347d9 100644
--- a/arch/mips/pci/pci-lantiq.c
+++ b/arch/mips/pci/pci-lantiq.c
@@ -20,7 +20,6 @@
#include <linux/of_irq.h>
#include <linux/of_pci.h>
-#include <asm/pci.h>
#include <asm/gpio.h>
#include <asm/addrspace.h>
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 308c5e1..00fdea2 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -46,7 +46,6 @@
#include <asm/mmu.h>
#include <asm/paca.h>
#include <asm/pgtable.h>
-#include <asm/pci.h>
#include <asm/iommu.h>
#include <asm/btext.h>
#include <asm/sections.h>
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index fd1fe4c..fcca807 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -37,7 +37,6 @@
#include <asm/smp.h>
#include <asm/mmu.h>
#include <asm/pgtable.h>
-#include <asm/pci.h>
#include <asm/iommu.h>
#include <asm/btext.h>
#include <asm/sections.h>
diff --git a/arch/sh/drivers/pci/ops-sh5.c b/arch/sh/drivers/pci/ops-sh5.c
index 4ce95a0..4536194 100644
--- a/arch/sh/drivers/pci/ops-sh5.c
+++ b/arch/sh/drivers/pci/ops-sh5.c
@@ -18,7 +18,6 @@
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/irq.h>
-#include <asm/pci.h>
#include <asm/io.h>
#include "pci-sh5.h"
diff --git a/arch/sh/drivers/pci/pci-sh5.c b/arch/sh/drivers/pci/pci-sh5.c
index 16c1e72..8229114 100644
--- a/arch/sh/drivers/pci/pci-sh5.c
+++ b/arch/sh/drivers/pci/pci-sh5.c
@@ -20,7 +20,6 @@
#include <linux/types.h>
#include <linux/irq.h>
#include <cpu/irq.h>
-#include <asm/pci.h>
#include <asm/io.h>
#include "pci-sh5.h"
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 234b072..eed5625 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -11,7 +11,6 @@
#include <asm/bios_ebda.h>
#include <asm/paravirt.h>
#include <asm/pci_x86.h>
-#include <asm/pci.h>
#include <asm/mpspec.h>
#include <asm/setup.h>
#include <asm/apic.h>
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 6/7] PCI: Remove unused pcibios_select_root() (again)
2015-06-04 21:49 [PATCH 0/7] Cleanup unused code Bjorn Helgaas
` (4 preceding siblings ...)
2015-06-04 21:49 ` Bjorn Helgaas
@ 2015-06-04 21:50 ` Bjorn Helgaas
2015-06-04 21:50 ` [PATCH 7/7] PCI: Remove unused pci_dma_burst_advice() Bjorn Helgaas
6 siblings, 0 replies; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-04 21:50 UTC (permalink / raw)
To: linux-pci
a6c140969b46 ("Delete pcibios_select_root") removed pcibios_select_root().
But a7db50405216 ("PCI: remove pcibios_scan_all_fns()") added a few copies
back, probably with some incorrect merge conflict resolutions.
Remove the still-unused pcibios_select_root() definitions.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
arch/ia64/include/asm/pci.h | 13 -------------
arch/microblaze/include/asm/pci.h | 13 -------------
arch/mn10300/include/asm/pci.h | 13 -------------
include/asm-generic/pci.h | 13 -------------
4 files changed, 52 deletions(-)
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 52af5ed..32ea19a 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -108,19 +108,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
return (pci_domain_nr(bus) != 0);
}
-static inline struct resource *
-pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-{
- struct resource *root = NULL;
-
- if (res->flags & IORESOURCE_IO)
- root = &ioport_resource;
- if (res->flags & IORESOURCE_MEM)
- root = &iomem_resource;
-
- return root;
-}
-
#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index 67224d3..e910a29 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -81,19 +81,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
*/
#define PCI_DMA_BUS_IS_PHYS (1)
-static inline struct resource *pcibios_select_root(struct pci_dev *pdev,
- struct resource *res)
-{
- struct resource *root = NULL;
-
- if (res->flags & IORESOURCE_IO)
- root = &ioport_resource;
- if (res->flags & IORESOURCE_MEM)
- root = &iomem_resource;
-
- return root;
-}
-
extern void pcibios_claim_one_bus(struct pci_bus *b);
extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h
index 5f70af2..c222d17 100644
--- a/arch/mn10300/include/asm/pci.h
+++ b/arch/mn10300/include/asm/pci.h
@@ -83,19 +83,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
/* implement the pci_ DMA API in terms of the generic device dma_ one */
#include <asm-generic/pci-dma-compat.h>
-static inline struct resource *
-pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-{
- struct resource *root = NULL;
-
- if (res->flags & IORESOURCE_IO)
- root = &ioport_resource;
- if (res->flags & IORESOURCE_MEM)
- root = &iomem_resource;
-
- return root;
-}
-
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
return channel ? 15 : 14;
diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
index e80a049..f24bc51 100644
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@ -6,19 +6,6 @@
#ifndef _ASM_GENERIC_PCI_H
#define _ASM_GENERIC_PCI_H
-static inline struct resource *
-pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-{
- struct resource *root = NULL;
-
- if (res->flags & IORESOURCE_IO)
- root = &ioport_resource;
- if (res->flags & IORESOURCE_MEM)
- root = &iomem_resource;
-
- return root;
-}
-
#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 7/7] PCI: Remove unused pci_dma_burst_advice()
2015-06-04 21:49 [PATCH 0/7] Cleanup unused code Bjorn Helgaas
` (5 preceding siblings ...)
2015-06-04 21:50 ` [PATCH 6/7] PCI: Remove unused pcibios_select_root() (again) Bjorn Helgaas
@ 2015-06-04 21:50 ` Bjorn Helgaas
6 siblings, 0 replies; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-04 21:50 UTC (permalink / raw)
To: linux-pci; +Cc: David S. Miller
pci_dma_burst_advice() was added by e24c2d963a60 ("[PATCH] PCI: DMA
bursting advice") but apparently never used. Remove it.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: David S. Miller <davem@davemloft.net>
---
arch/alpha/include/asm/pci.h | 16 ----------------
arch/arm/include/asm/pci.h | 10 ----------
arch/frv/include/asm/pci.h | 10 ----------
arch/ia64/include/asm/pci.h | 19 -------------------
arch/microblaze/include/asm/pci.h | 10 ----------
arch/mips/include/asm/pci.h | 10 ----------
arch/parisc/include/asm/pci.h | 19 -------------------
arch/powerpc/include/asm/pci.h | 30 ------------------------------
arch/sh/include/asm/pci.h | 18 ------------------
arch/sparc/include/asm/pci_32.h | 10 ----------
arch/sparc/include/asm/pci_64.h | 19 -------------------
arch/unicore32/include/asm/pci.h | 10 ----------
arch/x86/include/asm/pci.h | 7 -------
drivers/net/ethernet/sun/cassini.c | 1 -
include/linux/pci.h | 11 -----------
15 files changed, 200 deletions(-)
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h
index f7f680f..8b02afe 100644
--- a/arch/alpha/include/asm/pci.h
+++ b/arch/alpha/include/asm/pci.h
@@ -71,22 +71,6 @@ extern void pcibios_set_master(struct pci_dev *dev);
/* implement the pci_ DMA API in terms of the generic device dma_ one */
#include <asm-generic/pci-dma-compat.h>
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- unsigned long cacheline_size;
- u8 byte;
-
- pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
- if (byte == 0)
- cacheline_size = 1024;
- else
- cacheline_size = (int) byte * 4;
-
- *strat = PCI_DMA_BURST_BOUNDARY;
- *strategy_parameter = cacheline_size;
-}
#endif
/* TODO: integrate with include/asm-generic/pci.h ? */
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
index 585dc33..a563544 100644
--- a/arch/arm/include/asm/pci.h
+++ b/arch/arm/include/asm/pci.h
@@ -31,16 +31,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
*/
#define PCI_DMA_BUS_IS_PHYS (1)
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- *strat = PCI_DMA_BURST_INFINITY;
- *strategy_parameter = ~0UL;
-}
-#endif
-
#define HAVE_PCI_MMAP
extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine);
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h
index 2035a4d..a6d4ed0 100644
--- a/arch/frv/include/asm/pci.h
+++ b/arch/frv/include/asm/pci.h
@@ -41,16 +41,6 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size,
/* Return the index of the PCI controller for device PDEV. */
#define pci_controller_num(PDEV) (0)
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- *strat = PCI_DMA_BURST_INFINITY;
- *strategy_parameter = ~0UL;
-}
-#endif
-
/*
* These are pretty much arbitrary with the CoMEM implementation.
* We have the whole address space to ourselves.
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 32ea19a..b897fae 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -52,25 +52,6 @@ extern unsigned long ia64_max_iommu_merge_mask;
#include <asm-generic/pci-dma-compat.h>
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- unsigned long cacheline_size;
- u8 byte;
-
- pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
- if (byte == 0)
- cacheline_size = 1024;
- else
- cacheline_size = (int) byte * 4;
-
- *strat = PCI_DMA_BURST_MULTIPLE;
- *strategy_parameter = cacheline_size;
-}
-#endif
-
#define HAVE_PCI_MMAP
extern int pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine);
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index e910a29..b42ed68 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -42,16 +42,6 @@
*/
#define pcibios_assign_all_busses() 0
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- *strat = PCI_DMA_BURST_INFINITY;
- *strategy_parameter = ~0UL;
-}
-#endif
-
extern int pci_domain_nr(struct pci_bus *bus);
/* Decide whether to display the domain number in /proc */
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
index d969299..70dcc54 100644
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -113,16 +113,6 @@ struct pci_dev;
*/
extern unsigned int PCI_DMA_BUS_IS_PHYS;
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- *strat = PCI_DMA_BURST_INFINITY;
- *strategy_parameter = ~0UL;
-}
-#endif
-
#ifdef CONFIG_PCI_DOMAINS
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
diff --git a/arch/parisc/include/asm/pci.h b/arch/parisc/include/asm/pci.h
index 20df2b0..bf5e044 100644
--- a/arch/parisc/include/asm/pci.h
+++ b/arch/parisc/include/asm/pci.h
@@ -196,25 +196,6 @@ static inline void pcibios_register_hba(struct pci_hba_data *x)
/* export the pci_ DMA API in terms of the dma_ one */
#include <asm-generic/pci-dma-compat.h>
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- unsigned long cacheline_size;
- u8 byte;
-
- pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
- if (byte == 0)
- cacheline_size = 1024;
- else
- cacheline_size = (int) byte * 4;
-
- *strat = PCI_DMA_BURST_MULTIPLE;
- *strategy_parameter = cacheline_size;
-}
-#endif
-
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
return channel ? 15 : 14;
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index 4aef8d6..99dc432 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -71,36 +71,6 @@ extern struct dma_map_ops *get_pci_dma_ops(void);
*/
#define PCI_DISABLE_MWI
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- unsigned long cacheline_size;
- u8 byte;
-
- pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
- if (byte == 0)
- cacheline_size = 1024;
- else
- cacheline_size = (int) byte * 4;
-
- *strat = PCI_DMA_BURST_MULTIPLE;
- *strategy_parameter = cacheline_size;
-}
-#endif
-
-#else /* 32-bit */
-
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- *strat = PCI_DMA_BURST_INFINITY;
- *strategy_parameter = ~0UL;
-}
-#endif
#endif /* CONFIG_PPC64 */
extern int pci_domain_nr(struct pci_bus *bus);
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index 5b45115..e343dbd0 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -86,24 +86,6 @@ extern void pcibios_set_master(struct pci_dev *dev);
* direct memory write.
*/
#define PCI_DISABLE_MWI
-
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- unsigned long cacheline_size;
- u8 byte;
-
- pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
-
- if (byte == 0)
- cacheline_size = L1_CACHE_BYTES;
- else
- cacheline_size = byte << 2;
-
- *strat = PCI_DMA_BURST_MULTIPLE;
- *strategy_parameter = cacheline_size;
-}
#endif
/* Board-specific fixup routines. */
diff --git a/arch/sparc/include/asm/pci_32.h b/arch/sparc/include/asm/pci_32.h
index 53e9b49..b7c092df 100644
--- a/arch/sparc/include/asm/pci_32.h
+++ b/arch/sparc/include/asm/pci_32.h
@@ -22,16 +22,6 @@
struct pci_dev;
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- *strat = PCI_DMA_BURST_INFINITY;
- *strategy_parameter = ~0UL;
-}
-#endif
-
#endif /* __KERNEL__ */
#ifndef CONFIG_LEON_PCI
diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h
index bd00a62..022d160 100644
--- a/arch/sparc/include/asm/pci_64.h
+++ b/arch/sparc/include/asm/pci_64.h
@@ -31,25 +31,6 @@
#define PCI64_REQUIRED_MASK (~(u64)0)
#define PCI64_ADDR_BASE 0xfffc000000000000UL
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- unsigned long cacheline_size;
- u8 byte;
-
- pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
- if (byte == 0)
- cacheline_size = 1024;
- else
- cacheline_size = (int) byte * 4;
-
- *strat = PCI_DMA_BURST_BOUNDARY;
- *strategy_parameter = cacheline_size;
-}
-#endif
-
/* Return the index of the PCI controller for device PDEV. */
int pci_domain_nr(struct pci_bus *bus);
diff --git a/arch/unicore32/include/asm/pci.h b/arch/unicore32/include/asm/pci.h
index 654407e..38b3f37 100644
--- a/arch/unicore32/include/asm/pci.h
+++ b/arch/unicore32/include/asm/pci.h
@@ -18,16 +18,6 @@
#include <asm-generic/pci.h>
#include <mach/hardware.h> /* for PCIBIOS_MIN_* */
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- *strat = PCI_DMA_BURST_INFINITY;
- *strategy_parameter = ~0UL;
-}
-#endif
-
#define HAVE_PCI_MMAP
extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine);
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 4e370a5..e51c229 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -80,13 +80,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
#ifdef CONFIG_PCI
extern void early_quirks(void);
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
- unsigned long *strategy_parameter)
-{
- *strat = PCI_DMA_BURST_INFINITY;
- *strategy_parameter = ~0UL;
-}
#else
static inline void early_quirks(void) { }
#endif
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index 3dc1f68..6ce9731 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -3058,7 +3058,6 @@ static void cas_init_mac(struct cas *cp)
/* setup core arbitration weight register */
writel(CAWR_RR_DIS, cp->regs + REG_CAWR);
- /* XXX Use pci_dma_burst_advice() */
#if !defined(CONFIG_SPARC64) && !defined(CONFIG_ALPHA)
/* set the infinite burst register for chips that don't have
* pci issues.
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 353db8d..08fb4e3 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1197,15 +1197,6 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode,
#define pci_pool_alloc(pool, flags, handle) dma_pool_alloc(pool, flags, handle)
#define pci_pool_free(pool, vaddr, addr) dma_pool_free(pool, vaddr, addr)
-enum pci_dma_burst_strategy {
- PCI_DMA_BURST_INFINITY, /* make bursts as large as possible,
- strategy_parameter is N/A */
- PCI_DMA_BURST_BOUNDARY, /* disconnect at every strategy_parameter
- byte boundaries */
- PCI_DMA_BURST_MULTIPLE, /* disconnect at some multiple of
- strategy_parameter byte boundaries */
-};
-
struct msix_entry {
u32 vector; /* kernel uses to write allocated vector */
u16 entry; /* driver uses to specify entry, OS writes */
@@ -1430,8 +1421,6 @@ static inline int pci_request_regions(struct pci_dev *dev, const char *res_name)
{ return -EIO; }
static inline void pci_release_regions(struct pci_dev *dev) { }
-#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
-
static inline void pci_block_cfg_access(struct pci_dev *dev) { }
static inline int pci_block_cfg_access_in_atomic(struct pci_dev *dev)
{ return 0; }
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 5/7] PCI: Remove unnecessary #includes of <asm/pci.h>
2015-06-04 21:49 ` Bjorn Helgaas
@ 2015-06-05 1:53 ` Simon Horman
-1 siblings, 0 replies; 19+ messages in thread
From: Simon Horman @ 2015-06-05 1:53 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, linux-sh, linuxppc-dev, x86, linux-alpha
On Thu, Jun 04, 2015 at 04:49:57PM -0500, Bjorn Helgaas wrote:
> In include/linux/pci.h, we already #include <asm/pci.h>, so we don't need
> to include <asm/pci.h> directly.
>
> Remove the unnecessary includes. All the files here already include
> <linux/pci.h>.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> CC: linux-alpha@vger.kernel.org
> CC: linux-mips@linux-mips.org
> CC: linuxppc-dev@lists.ozlabs.org
> CC: linux-sh@vger.kernel.org
> CC: x86@kernel.org
> ---
> arch/alpha/kernel/core_irongate.c | 1 -
> arch/alpha/kernel/sys_eiger.c | 1 -
> arch/alpha/kernel/sys_nautilus.c | 1 -
> arch/mips/pci/fixup-cobalt.c | 1 -
> arch/mips/pci/ops-mace.c | 1 -
> arch/mips/pci/pci-lantiq.c | 1 -
> arch/powerpc/kernel/prom.c | 1 -
> arch/powerpc/kernel/prom_init.c | 1 -
> arch/sh/drivers/pci/ops-sh5.c | 1 -
> arch/sh/drivers/pci/pci-sh5.c | 1 -
> arch/x86/kernel/x86_init.c | 1 -
> 11 files changed, 11 deletions(-)
arch/sh/drivers portion:
Acked-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 5/7] PCI: Remove unnecessary #includes of <asm/pci.h>
@ 2015-06-05 1:53 ` Simon Horman
0 siblings, 0 replies; 19+ messages in thread
From: Simon Horman @ 2015-06-05 1:53 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, linux-sh, linuxppc-dev, x86, linux-alpha
On Thu, Jun 04, 2015 at 04:49:57PM -0500, Bjorn Helgaas wrote:
> In include/linux/pci.h, we already #include <asm/pci.h>, so we don't need
> to include <asm/pci.h> directly.
>
> Remove the unnecessary includes. All the files here already include
> <linux/pci.h>.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> CC: linux-alpha@vger.kernel.org
> CC: linux-mips@linux-mips.org
> CC: linuxppc-dev@lists.ozlabs.org
> CC: linux-sh@vger.kernel.org
> CC: x86@kernel.org
> ---
> arch/alpha/kernel/core_irongate.c | 1 -
> arch/alpha/kernel/sys_eiger.c | 1 -
> arch/alpha/kernel/sys_nautilus.c | 1 -
> arch/mips/pci/fixup-cobalt.c | 1 -
> arch/mips/pci/ops-mace.c | 1 -
> arch/mips/pci/pci-lantiq.c | 1 -
> arch/powerpc/kernel/prom.c | 1 -
> arch/powerpc/kernel/prom_init.c | 1 -
> arch/sh/drivers/pci/ops-sh5.c | 1 -
> arch/sh/drivers/pci/pci-sh5.c | 1 -
> arch/x86/kernel/x86_init.c | 1 -
> 11 files changed, 11 deletions(-)
arch/sh/drivers portion:
Acked-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/7] microblaze/PCI: Remove unused declarations
2015-06-04 21:49 ` [PATCH 1/7] microblaze/PCI: Remove unused declarations Bjorn Helgaas
@ 2015-06-05 7:07 ` Michal Simek
2015-06-05 15:11 ` Bjorn Helgaas
0 siblings, 1 reply; 19+ messages in thread
From: Michal Simek @ 2015-06-05 7:07 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci
[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
On 06/04/2015 11:49 PM, Bjorn Helgaas wrote:
> The following declarations were copied from powerpc but are unused on
> microblaze:
>
> struct pci_controller *init_phb_dynamic(struct device_node *dn)
> int remove_phb_dynamic(struct pci_controller *phb)
> struct pci_dev *of_create_pci_dev(struct device_node *node, ...)
> void of_scan_pci_bridge(struct device_node *node, ...)
> void of_scan_bus(struct device_node *node, struct pci_bus *bus)
> void of_rescan_bus(struct device_node *node, struct pci_bus *bus)
>
> Remove them.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> CC: Michal Simek <monstr@monstr.eu>
> ---
> arch/microblaze/include/asm/pci.h | 12 ------------
> 1 file changed, 12 deletions(-)
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Bjorn: Do you want me to take this via Microblaze tree?
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration
2015-06-04 21:49 ` [PATCH 2/7] microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration Bjorn Helgaas
@ 2015-06-05 7:07 ` Michal Simek
0 siblings, 0 replies; 19+ messages in thread
From: Michal Simek @ 2015-06-05 7:07 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --]
On 06/04/2015 11:49 PM, Bjorn Helgaas wrote:
> pci_bus_find_capability() is declared in include/linux/pci.h.
>
> Remove the pci_bus_find_capability() declaration from
> arch/microblaze/include/asm/pci.h.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> CC: Michal Simek <monstr@monstr.eu>
> ---
> arch/microblaze/include/asm/pci.h | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
> index b6b5b3c..541400d 100644
> --- a/arch/microblaze/include/asm/pci.h
> +++ b/arch/microblaze/include/asm/pci.h
> @@ -102,9 +102,6 @@ extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
>
> extern void pcibios_resource_survey(void);
>
> -extern int pci_bus_find_capability(struct pci_bus *bus,
> - unsigned int devfn, int cap);
> -
> struct file;
> extern pgprot_t pci_phys_mem_access_prot(struct file *file,
> unsigned long pfn,
>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Bjorn: Do you want me to take this via Microblaze tree?
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/7] microblaze/PCI: Remove unnecessary struct pci_dev declaration
2015-06-04 21:49 ` [PATCH 3/7] microblaze/PCI: Remove unnecessary struct pci_dev declaration Bjorn Helgaas
@ 2015-06-05 7:07 ` Michal Simek
0 siblings, 0 replies; 19+ messages in thread
From: Michal Simek @ 2015-06-05 7:07 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci
[-- Attachment #1: Type: text/plain, Size: 1385 bytes --]
On 06/04/2015 11:49 PM, Bjorn Helgaas wrote:
> All users of arch/microblaze/include/asm/pci.h get it by including
> include/linux/pci.h, which in turn includes <asm/pci.h> after it declares
> struct pci_dev.
>
> The forward declaration here is unnecessary, so remove it.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> CC: Michal Simek <monstr@monstr.eu>
> ---
> arch/microblaze/include/asm/pci.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
> index 541400d..67224d3 100644
> --- a/arch/microblaze/include/asm/pci.h
> +++ b/arch/microblaze/include/asm/pci.h
> @@ -27,8 +27,6 @@
> #define PCIBIOS_MIN_IO 0x1000
> #define PCIBIOS_MIN_MEM 0x10000000
>
> -struct pci_dev;
> -
> /* Values for the `which' argument to sys_pciconfig_iobase syscall. */
> #define IOBASE_BRIDGE_NUMBER 0
> #define IOBASE_MEMORY 1
>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Bjorn: Do you want me to take this via Microblaze tree?
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 5/7] PCI: Remove unnecessary #includes of <asm/pci.h>
2015-06-04 21:49 ` Bjorn Helgaas
@ 2015-06-05 8:08 ` Ralf Baechle
-1 siblings, 0 replies; 19+ messages in thread
From: Ralf Baechle @ 2015-06-05 8:08 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, linux-sh, linuxppc-dev, x86, linux-alpha
Acked-by: Ralf Baechle <ralf@linux-mips.org>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 5/7] PCI: Remove unnecessary #includes of <asm/pci.h>
@ 2015-06-05 8:08 ` Ralf Baechle
0 siblings, 0 replies; 19+ messages in thread
From: Ralf Baechle @ 2015-06-05 8:08 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, linux-sh, linuxppc-dev, x86, linux-alpha
Acked-by: Ralf Baechle <ralf@linux-mips.org>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/7] microblaze/PCI: Remove unused declarations
2015-06-05 7:07 ` Michal Simek
@ 2015-06-05 15:11 ` Bjorn Helgaas
2015-06-08 8:06 ` Michal Simek
0 siblings, 1 reply; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-05 15:11 UTC (permalink / raw)
To: Michal Simek; +Cc: linux-pci
On Fri, Jun 5, 2015 at 2:07 AM, Michal Simek <monstr@monstr.eu> wrote:
> On 06/04/2015 11:49 PM, Bjorn Helgaas wrote:
>> The following declarations were copied from powerpc but are unused on
>> microblaze:
>>
>> struct pci_controller *init_phb_dynamic(struct device_node *dn)
>> int remove_phb_dynamic(struct pci_controller *phb)
>> struct pci_dev *of_create_pci_dev(struct device_node *node, ...)
>> void of_scan_pci_bridge(struct device_node *node, ...)
>> void of_scan_bus(struct device_node *node, struct pci_bus *bus)
>> void of_rescan_bus(struct device_node *node, struct pci_bus *bus)
>>
>> Remove them.
>>
>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
>> CC: Michal Simek <monstr@monstr.eu>
>> ---
>> arch/microblaze/include/asm/pci.h | 12 ------------
>> 1 file changed, 12 deletions(-)
>
> Reviewed-by: Michal Simek <michal.simek@xilinx.com>
>
> Bjorn: Do you want me to take this via Microblaze tree?
Sure, it'd be great if you take all the Microblaze-specific patches.
There aren't any dependencies on them, so there shouldn't be any
problem.
I do have a Microblaze hunk in "PCI: Remove unused
pci_dma_burst_advice()" and if you agree, I'll merge that one through
my tree since the change for each arch is essentially identical.
Bjorn
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/7] microblaze/PCI: Remove unused declarations
2015-06-05 15:11 ` Bjorn Helgaas
@ 2015-06-08 8:06 ` Michal Simek
2015-06-08 12:58 ` Bjorn Helgaas
0 siblings, 1 reply; 19+ messages in thread
From: Michal Simek @ 2015-06-08 8:06 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-pci
[-- Attachment #1: Type: text/plain, Size: 1881 bytes --]
On 06/05/2015 05:11 PM, Bjorn Helgaas wrote:
> On Fri, Jun 5, 2015 at 2:07 AM, Michal Simek <monstr@monstr.eu> wrote:
>> On 06/04/2015 11:49 PM, Bjorn Helgaas wrote:
>>> The following declarations were copied from powerpc but are unused on
>>> microblaze:
>>>
>>> struct pci_controller *init_phb_dynamic(struct device_node *dn)
>>> int remove_phb_dynamic(struct pci_controller *phb)
>>> struct pci_dev *of_create_pci_dev(struct device_node *node, ...)
>>> void of_scan_pci_bridge(struct device_node *node, ...)
>>> void of_scan_bus(struct device_node *node, struct pci_bus *bus)
>>> void of_rescan_bus(struct device_node *node, struct pci_bus *bus)
>>>
>>> Remove them.
>>>
>>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
>>> CC: Michal Simek <monstr@monstr.eu>
>>> ---
>>> arch/microblaze/include/asm/pci.h | 12 ------------
>>> 1 file changed, 12 deletions(-)
>>
>> Reviewed-by: Michal Simek <michal.simek@xilinx.com>
>>
>> Bjorn: Do you want me to take this via Microblaze tree?
>
> Sure, it'd be great if you take all the Microblaze-specific patches.
> There aren't any dependencies on them, so there shouldn't be any
> problem.
Ok. Added these 3 patches to microblaze next branch - it will be in
linux-next tmr.
>
> I do have a Microblaze hunk in "PCI: Remove unused
> pci_dma_burst_advice()" and if you agree, I'll merge that one through
> my tree since the change for each arch is essentially identical.
No problem at all. Feel free to add there my acked-by line for microblaze.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/7] microblaze/PCI: Remove unused declarations
2015-06-08 8:06 ` Michal Simek
@ 2015-06-08 12:58 ` Bjorn Helgaas
0 siblings, 0 replies; 19+ messages in thread
From: Bjorn Helgaas @ 2015-06-08 12:58 UTC (permalink / raw)
To: Michal Simek; +Cc: linux-pci
On Mon, Jun 08, 2015 at 10:06:30AM +0200, Michal Simek wrote:
> On 06/05/2015 05:11 PM, Bjorn Helgaas wrote:
> > On Fri, Jun 5, 2015 at 2:07 AM, Michal Simek <monstr@monstr.eu> wrote:
> >> On 06/04/2015 11:49 PM, Bjorn Helgaas wrote:
> >>> The following declarations were copied from powerpc but are unused on
> >>> microblaze:
> >>>
> >>> struct pci_controller *init_phb_dynamic(struct device_node *dn)
> >>> int remove_phb_dynamic(struct pci_controller *phb)
> >>> struct pci_dev *of_create_pci_dev(struct device_node *node, ...)
> >>> void of_scan_pci_bridge(struct device_node *node, ...)
> >>> void of_scan_bus(struct device_node *node, struct pci_bus *bus)
> >>> void of_rescan_bus(struct device_node *node, struct pci_bus *bus)
> >>>
> >>> Remove them.
> >>>
> >>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> >>> CC: Michal Simek <monstr@monstr.eu>
> >>> ---
> >>> arch/microblaze/include/asm/pci.h | 12 ------------
> >>> 1 file changed, 12 deletions(-)
> >>
> >> Reviewed-by: Michal Simek <michal.simek@xilinx.com>
> >>
> >> Bjorn: Do you want me to take this via Microblaze tree?
> >
> > Sure, it'd be great if you take all the Microblaze-specific patches.
> > There aren't any dependencies on them, so there shouldn't be any
> > problem.
>
> Ok. Added these 3 patches to microblaze next branch - it will be in
> linux-next tmr.
Great, thanks! I dropped them from my branch.
> > I do have a Microblaze hunk in "PCI: Remove unused
> > pci_dma_burst_advice()" and if you agree, I'll merge that one through
> > my tree since the change for each arch is essentially identical.
>
> No problem at all. Feel free to add there my acked-by line for microblaze.
Done, thanks again!
Bjorn
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2015-06-08 12:58 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-04 21:49 [PATCH 0/7] Cleanup unused code Bjorn Helgaas
2015-06-04 21:49 ` [PATCH 1/7] microblaze/PCI: Remove unused declarations Bjorn Helgaas
2015-06-05 7:07 ` Michal Simek
2015-06-05 15:11 ` Bjorn Helgaas
2015-06-08 8:06 ` Michal Simek
2015-06-08 12:58 ` Bjorn Helgaas
2015-06-04 21:49 ` [PATCH 2/7] microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration Bjorn Helgaas
2015-06-05 7:07 ` Michal Simek
2015-06-04 21:49 ` [PATCH 3/7] microblaze/PCI: Remove unnecessary struct pci_dev declaration Bjorn Helgaas
2015-06-05 7:07 ` Michal Simek
2015-06-04 21:49 ` [PATCH 4/7] PCI: Include <linux/pci.h>, not <asm/pci.h> Bjorn Helgaas
2015-06-04 21:49 ` [PATCH 5/7] PCI: Remove unnecessary #includes of <asm/pci.h> Bjorn Helgaas
2015-06-04 21:49 ` Bjorn Helgaas
2015-06-05 1:53 ` Simon Horman
2015-06-05 1:53 ` Simon Horman
2015-06-05 8:08 ` Ralf Baechle
2015-06-05 8:08 ` Ralf Baechle
2015-06-04 21:50 ` [PATCH 6/7] PCI: Remove unused pcibios_select_root() (again) Bjorn Helgaas
2015-06-04 21:50 ` [PATCH 7/7] PCI: Remove unused pci_dma_burst_advice() Bjorn Helgaas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.