* [PATCH 1/4] PCI: Remove redundant pcibios_set_master() declarations
2017-10-05 20:38 [PATCH 0/4] PCI: Cleanup unused stuff Bjorn Helgaas
@ 2017-10-05 20:38 ` Bjorn Helgaas
2017-10-05 20:57 ` Thomas Gleixner
` (2 more replies)
2017-10-05 20:38 ` [PATCH 2/4] PCI: Remove redundant pci_dev, pci_bus, resource declarations Bjorn Helgaas
` (3 subsequent siblings)
4 siblings, 3 replies; 12+ messages in thread
From: Bjorn Helgaas @ 2017-10-05 20:38 UTC (permalink / raw)
To: linux-pci
Cc: linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Thomas Gleixner,
Richard Henderson, Chris Zankel, Tony Luck, linux-cris-kernel,
linux-parisc, Ralf Baechle, linux-alpha, linuxppc-dev,
David S. Miller
From: Bjorn Helgaas <bhelgaas@google.com>
All users of pcibios_set_master() include <linux/pci.h>, which already has
a declaration. Remove the unnecessary declarations from the <asm/pci.h>
files.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
arch/alpha/include/asm/pci.h | 2 --
arch/cris/include/asm/pci.h | 1 -
arch/frv/include/asm/pci.h | 2 --
arch/mips/include/asm/pci.h | 2 --
arch/mn10300/include/asm/pci.h | 2 --
arch/parisc/include/asm/pci.h | 1 -
arch/sh/include/asm/pci.h | 2 --
arch/x86/include/asm/pci.h | 1 -
8 files changed, 13 deletions(-)
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h
index a06c24b3a2e1..777be3114fda 100644
--- a/arch/alpha/include/asm/pci.h
+++ b/arch/alpha/include/asm/pci.h
@@ -56,8 +56,6 @@ struct pci_controller {
#define PCIBIOS_MIN_IO alpha_mv.min_io_address
#define PCIBIOS_MIN_MEM alpha_mv.min_mem_address
-extern void pcibios_set_master(struct pci_dev *dev);
-
/* IOMMU controls. */
/* The PCI address space does not equal the physical memory address space.
diff --git a/arch/cris/include/asm/pci.h b/arch/cris/include/asm/pci.h
index 6e505332b3e3..c6ac59d9f815 100644
--- a/arch/cris/include/asm/pci.h
+++ b/arch/cris/include/asm/pci.h
@@ -19,7 +19,6 @@
void pcibios_config_init(void);
struct pci_bus * pcibios_scan_root(int bus);
-void pcibios_set_master(struct pci_dev *dev);
struct irq_routing_table *pcibios_get_irq_routing_table(void);
int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h
index 809cfc6707ab..a6957014e74e 100644
--- a/arch/frv/include/asm/pci.h
+++ b/arch/frv/include/asm/pci.h
@@ -21,8 +21,6 @@ struct pci_dev;
#define pcibios_assign_all_busses() 0
-extern void pcibios_set_master(struct pci_dev *dev);
-
#ifdef CONFIG_MMU
extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle);
extern void consistent_free(void *vaddr);
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
index 52f551ee492d..0f8528c34753 100644
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -106,8 +106,6 @@ extern unsigned long PCIBIOS_MIN_MEM;
#define PCIBIOS_MIN_CARDBUS_IO 0x4000
-extern void pcibios_set_master(struct pci_dev *dev);
-
#define HAVE_PCI_MMAP
#define ARCH_GENERIC_PCI_MMAP_RESOURCE
#define HAVE_ARCH_PCI_RESOURCE_TO_USER
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h
index d27654902f28..bdacb618d6af 100644
--- a/arch/mn10300/include/asm/pci.h
+++ b/arch/mn10300/include/asm/pci.h
@@ -47,8 +47,6 @@ extern void unit_pci_init(void);
#define PCIBIOS_MIN_IO 0xBE000004
#define PCIBIOS_MIN_MEM 0xB8000000
-void pcibios_set_master(struct pci_dev *dev);
-
/* Dynamic DMA mapping stuff.
* i386 has everything mapped statically.
*/
diff --git a/arch/parisc/include/asm/pci.h b/arch/parisc/include/asm/pci.h
index 1de1a3f412ec..b5730f83b941 100644
--- a/arch/parisc/include/asm/pci.h
+++ b/arch/parisc/include/asm/pci.h
@@ -161,7 +161,6 @@ extern struct pci_bios_ops *pci_bios;
#ifdef CONFIG_PCI
extern void pcibios_register_hba(struct pci_hba_data *);
-extern void pcibios_set_master(struct pci_dev *);
#else
static inline void pcibios_register_hba(struct pci_hba_data *x)
{
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index 17fa69bc814d..063c8003b169 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -68,8 +68,6 @@ struct pci_dev;
#define HAVE_PCI_MMAP
#define ARCH_GENERIC_PCI_MMAP_RESOURCE
-extern void pcibios_set_master(struct pci_dev *dev);
-
/* Dynamic DMA mapping stuff.
* SuperH has everything mapped statically like x86.
*/
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 473a7295ab10..645019085bb8 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -91,7 +91,6 @@ extern int pcibios_enabled;
void pcibios_config_init(void);
void pcibios_scan_root(int bus);
-void pcibios_set_master(struct pci_dev *dev);
struct irq_routing_table *pcibios_get_irq_routing_table(void);
int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/4] PCI: Remove redundant pcibios_set_master() declarations
2017-10-05 20:38 ` [PATCH 1/4] PCI: Remove redundant pcibios_set_master() declarations Bjorn Helgaas
@ 2017-10-05 20:57 ` Thomas Gleixner
2017-10-06 7:28 ` Jesper Nilsson
2017-10-09 13:10 ` Ralf Baechle
2 siblings, 0 replies; 12+ messages in thread
From: Thomas Gleixner @ 2017-10-05 20:57 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Richard Henderson,
Chris Zankel, Tony Luck, linux-cris-kernel, linux-parisc,
Ralf Baechle, linux-alpha, linuxppc-dev, David S. Miller
On Thu, 5 Oct 2017, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> All users of pcibios_set_master() include <linux/pci.h>, which already has
> a declaration. Remove the unnecessary declarations from the <asm/pci.h>
> files.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] PCI: Remove redundant pcibios_set_master() declarations
2017-10-05 20:38 ` [PATCH 1/4] PCI: Remove redundant pcibios_set_master() declarations Bjorn Helgaas
2017-10-05 20:57 ` Thomas Gleixner
@ 2017-10-06 7:28 ` Jesper Nilsson
2017-10-09 13:10 ` Ralf Baechle
2 siblings, 0 replies; 12+ messages in thread
From: Jesper Nilsson @ 2017-10-06 7:28 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Thomas Gleixner,
Richard Henderson, Chris Zankel, Tony Luck, linux-cris-kernel,
linux-parisc, Ralf Baechle, linux-alpha, linuxppc-dev,
David S. Miller
On Thu, Oct 05, 2017 at 03:38:42PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> All users of pcibios_set_master() include <linux/pci.h>, which already has
> a declaration. Remove the unnecessary declarations from the <asm/pci.h>
> files.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> arch/alpha/include/asm/pci.h | 2 --
> arch/cris/include/asm/pci.h | 1 -
For what it's worth, for the cris changes:
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
> arch/frv/include/asm/pci.h | 2 --
> arch/mips/include/asm/pci.h | 2 --
> arch/mn10300/include/asm/pci.h | 2 --
> arch/parisc/include/asm/pci.h | 1 -
> arch/sh/include/asm/pci.h | 2 --
> arch/x86/include/asm/pci.h | 1 -
> 8 files changed, 13 deletions(-)
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/4] PCI: Remove redundant pcibios_set_master() declarations
2017-10-05 20:38 ` [PATCH 1/4] PCI: Remove redundant pcibios_set_master() declarations Bjorn Helgaas
2017-10-05 20:57 ` Thomas Gleixner
2017-10-06 7:28 ` Jesper Nilsson
@ 2017-10-09 13:10 ` Ralf Baechle
2 siblings, 0 replies; 12+ messages in thread
From: Ralf Baechle @ 2017-10-09 13:10 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Thomas Gleixner,
Richard Henderson, Chris Zankel, Tony Luck, linux-cris-kernel,
linux-parisc, linux-alpha, linuxppc-dev, David S. Miller
On Thu, Oct 05, 2017 at 03:38:42PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> All users of pcibios_set_master() include <linux/pci.h>, which already has
> a declaration. Remove the unnecessary declarations from the <asm/pci.h>
> files.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> arch/alpha/include/asm/pci.h | 2 --
> arch/cris/include/asm/pci.h | 1 -
> arch/frv/include/asm/pci.h | 2 --
> arch/mips/include/asm/pci.h | 2 --
> arch/mn10300/include/asm/pci.h | 2 --
> arch/parisc/include/asm/pci.h | 1 -
> arch/sh/include/asm/pci.h | 2 --
> arch/x86/include/asm/pci.h | 1 -
> 8 files changed, 13 deletions(-)
For MIPS:
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Ralf
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/4] PCI: Remove redundant pci_dev, pci_bus, resource declarations
2017-10-05 20:38 [PATCH 0/4] PCI: Cleanup unused stuff Bjorn Helgaas
2017-10-05 20:38 ` [PATCH 1/4] PCI: Remove redundant pcibios_set_master() declarations Bjorn Helgaas
@ 2017-10-05 20:38 ` Bjorn Helgaas
2017-10-06 7:27 ` Jesper Nilsson
2017-10-09 13:12 ` Ralf Baechle
2017-10-05 20:38 ` [PATCH 3/4] PCI: Remove unused declarations Bjorn Helgaas
` (2 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Bjorn Helgaas @ 2017-10-05 20:38 UTC (permalink / raw)
To: linux-pci
Cc: linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Thomas Gleixner,
Richard Henderson, Chris Zankel, Tony Luck, linux-cris-kernel,
linux-parisc, Ralf Baechle, linux-alpha, linuxppc-dev,
David S. Miller
From: Bjorn Helgaas <bhelgaas@google.com>
<linux/pci.h> defines struct pci_bus and struct pci_dev and includes the
struct resource definition before including <asm/pci.h>. Nobody includes
<asm/pci.h> directly, so they don't need their own declarations.
Remove the redundant struct pci_dev, pci_bus, resource declarations.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
arch/alpha/include/asm/pci.h | 3 ---
arch/cris/include/asm/pci.h | 2 --
arch/frv/include/asm/pci.h | 2 --
arch/ia64/include/asm/pci.h | 2 --
arch/mips/include/asm/pci.h | 2 --
arch/mn10300/include/asm/pci.h | 2 --
arch/parisc/include/asm/pci.h | 7 -------
arch/powerpc/include/asm/pci.h | 2 --
arch/sh/include/asm/pci.h | 2 --
arch/sparc/include/asm/pci_32.h | 2 --
arch/xtensa/include/asm/pci.h | 2 --
11 files changed, 28 deletions(-)
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h
index 777be3114fda..0a10ff93b174 100644
--- a/arch/alpha/include/asm/pci.h
+++ b/arch/alpha/include/asm/pci.h
@@ -12,9 +12,6 @@
* The following structure is used to manage multiple PCI busses.
*/
-struct pci_dev;
-struct pci_bus;
-struct resource;
struct pci_iommu_arena;
struct page;
diff --git a/arch/cris/include/asm/pci.h b/arch/cris/include/asm/pci.h
index c6ac59d9f815..8ea640560a46 100644
--- a/arch/cris/include/asm/pci.h
+++ b/arch/cris/include/asm/pci.h
@@ -32,8 +32,6 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
#include <linux/string.h>
#include <asm/io.h>
-struct pci_dev;
-
/* The PCI address space does equal the physical memory
* address space. The networking and block device layers use
* this boolean for bounce buffer decisions.
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h
index a6957014e74e..895af9d558ba 100644
--- a/arch/frv/include/asm/pci.h
+++ b/arch/frv/include/asm/pci.h
@@ -17,8 +17,6 @@
#include <linux/scatterlist.h>
#include <asm-generic/pci.h>
-struct pci_dev;
-
#define pcibios_assign_all_busses() 0
#ifdef CONFIG_MMU
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 6459f2d46200..8c4b37f6be3d 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -31,8 +31,6 @@ struct pci_vector_struct {
void pcibios_config_init(void);
-struct pci_dev;
-
/*
* PCI_DMA_BUS_IS_PHYS should be set to 1 if there is _necessarily_ a direct
* correspondence between device bus addresses and CPU physical addresses.
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
index 0f8528c34753..2339f42f047a 100644
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -121,8 +121,6 @@ extern unsigned long PCIBIOS_MIN_MEM;
#include <linux/string.h>
#include <asm/io.h>
-struct pci_dev;
-
/*
* The PCI address space does equal the physical memory address space.
* The networking and block device layers use this boolean for bounce
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h
index bdacb618d6af..5b75a1b2c4f6 100644
--- a/arch/mn10300/include/asm/pci.h
+++ b/arch/mn10300/include/asm/pci.h
@@ -57,8 +57,6 @@ extern void unit_pci_init(void);
#include <linux/string.h>
#include <asm/io.h>
-struct pci_dev;
-
/* The PCI address space does equal the physical memory
* address space. The networking and block device layers use
* this boolean for bounce buffer decisions.
diff --git a/arch/parisc/include/asm/pci.h b/arch/parisc/include/asm/pci.h
index b5730f83b941..8cc009e26a28 100644
--- a/arch/parisc/include/asm/pci.h
+++ b/arch/parisc/include/asm/pci.h
@@ -86,13 +86,6 @@ struct pci_hba_data {
#define PCI_F_EXTEND 0UL
#endif /* !CONFIG_64BIT */
-/*
-** KLUGE: linux/pci.h include asm/pci.h BEFORE declaring struct pci_bus
-** (This eliminates some of the warnings).
-*/
-struct pci_bus;
-struct pci_dev;
-
/*
* If the PCI device's view of memory is the same as the CPU's view of memory,
* PCI_DMA_BUS_IS_PHYS is true. The networking and block device layers use
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index c8975dac535f..8dc32eacc97c 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -28,8 +28,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
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index 063c8003b169..6c2d68e08a57 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -63,8 +63,6 @@ extern int pci_is_66mhz_capable(struct pci_channel *hose,
extern unsigned long PCIBIOS_MIN_IO, PCIBIOS_MIN_MEM;
-struct pci_dev;
-
#define HAVE_PCI_MMAP
#define ARCH_GENERIC_PCI_MMAP_RESOURCE
diff --git a/arch/sparc/include/asm/pci_32.h b/arch/sparc/include/asm/pci_32.h
index b7c092df3134..8b0e26232c78 100644
--- a/arch/sparc/include/asm/pci_32.h
+++ b/arch/sparc/include/asm/pci_32.h
@@ -20,8 +20,6 @@
*/
#define PCI_DMA_BUS_IS_PHYS (0)
-struct pci_dev;
-
#endif /* __KERNEL__ */
#ifndef CONFIG_LEON_PCI
diff --git a/arch/xtensa/include/asm/pci.h b/arch/xtensa/include/asm/pci.h
index e4f366a488d3..5c83798e3b2e 100644
--- a/arch/xtensa/include/asm/pci.h
+++ b/arch/xtensa/include/asm/pci.h
@@ -37,8 +37,6 @@ extern struct pci_controller* pcibios_alloc_controller(void);
#include <linux/string.h>
#include <asm/io.h>
-struct pci_dev;
-
/* The PCI address space does equal the physical memory address space.
* The networking and block device layers use this boolean for bounce buffer
* decisions.
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/4] PCI: Remove redundant pci_dev, pci_bus, resource declarations
2017-10-05 20:38 ` [PATCH 2/4] PCI: Remove redundant pci_dev, pci_bus, resource declarations Bjorn Helgaas
@ 2017-10-06 7:27 ` Jesper Nilsson
2017-10-09 13:12 ` Ralf Baechle
1 sibling, 0 replies; 12+ messages in thread
From: Jesper Nilsson @ 2017-10-06 7:27 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Thomas Gleixner,
Richard Henderson, Chris Zankel, Tony Luck, linux-cris-kernel,
linux-parisc, Ralf Baechle, linux-alpha, linuxppc-dev,
David S. Miller
On Thu, Oct 05, 2017 at 03:38:49PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> <linux/pci.h> defines struct pci_bus and struct pci_dev and includes the
> struct resource definition before including <asm/pci.h>. Nobody includes
> <asm/pci.h> directly, so they don't need their own declarations.
>
> Remove the redundant struct pci_dev, pci_bus, resource declarations.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> arch/alpha/include/asm/pci.h | 3 ---
> arch/cris/include/asm/pci.h | 2 --
For what it's worth, for the cris changes:
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
> arch/frv/include/asm/pci.h | 2 --
> arch/ia64/include/asm/pci.h | 2 --
> arch/mips/include/asm/pci.h | 2 --
> arch/mn10300/include/asm/pci.h | 2 --
> arch/parisc/include/asm/pci.h | 7 -------
> arch/powerpc/include/asm/pci.h | 2 --
> arch/sh/include/asm/pci.h | 2 --
> arch/sparc/include/asm/pci_32.h | 2 --
> arch/xtensa/include/asm/pci.h | 2 --
> 11 files changed, 28 deletions(-)
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/4] PCI: Remove redundant pci_dev, pci_bus, resource declarations
2017-10-05 20:38 ` [PATCH 2/4] PCI: Remove redundant pci_dev, pci_bus, resource declarations Bjorn Helgaas
2017-10-06 7:27 ` Jesper Nilsson
@ 2017-10-09 13:12 ` Ralf Baechle
1 sibling, 0 replies; 12+ messages in thread
From: Ralf Baechle @ 2017-10-09 13:12 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Thomas Gleixner,
Richard Henderson, Chris Zankel, Tony Luck, linux-cris-kernel,
linux-parisc, linux-alpha, linuxppc-dev, David S. Miller
On Thu, Oct 05, 2017 at 03:38:49PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> <linux/pci.h> defines struct pci_bus and struct pci_dev and includes the
> struct resource definition before including <asm/pci.h>. Nobody includes
> <asm/pci.h> directly, so they don't need their own declarations.
>
> Remove the redundant struct pci_dev, pci_bus, resource declarations.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
For MIPS:
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Ralf
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/4] PCI: Remove unused declarations
2017-10-05 20:38 [PATCH 0/4] PCI: Cleanup unused stuff Bjorn Helgaas
2017-10-05 20:38 ` [PATCH 1/4] PCI: Remove redundant pcibios_set_master() declarations Bjorn Helgaas
2017-10-05 20:38 ` [PATCH 2/4] PCI: Remove redundant pci_dev, pci_bus, resource declarations Bjorn Helgaas
@ 2017-10-05 20:38 ` Bjorn Helgaas
2017-10-05 20:57 ` Thomas Gleixner
2017-10-05 20:39 ` [PATCH 4/4] alpha/PCI: Make pdev_save_srm_config() static Bjorn Helgaas
2017-10-07 8:58 ` [PATCH 0/4] PCI: Cleanup unused stuff Ingo Molnar
4 siblings, 1 reply; 12+ messages in thread
From: Bjorn Helgaas @ 2017-10-05 20:38 UTC (permalink / raw)
To: linux-pci
Cc: linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Thomas Gleixner,
Richard Henderson, Chris Zankel, Tony Luck, linux-cris-kernel,
linux-parisc, Ralf Baechle, linux-alpha, linuxppc-dev,
David S. Miller
From: Bjorn Helgaas <bhelgaas@google.com>
Remove these unused declarations:
pcibios_config_init() # never defined anywhere
pcibios_scan_root() # only defined by x86
pcibios_get_irq_routing_table() # only defined by x86
pcibios_set_irq_routing() # only defined by x86
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
arch/cris/include/asm/pci.h | 6 ------
arch/ia64/include/asm/pci.h | 2 --
arch/mn10300/unit-asb2305/pci-asb2305.h | 3 ---
arch/x86/include/asm/pci.h | 1 -
4 files changed, 12 deletions(-)
diff --git a/arch/cris/include/asm/pci.h b/arch/cris/include/asm/pci.h
index 8ea640560a46..141337bf16bc 100644
--- a/arch/cris/include/asm/pci.h
+++ b/arch/cris/include/asm/pci.h
@@ -16,12 +16,6 @@
#define PCIBIOS_MIN_CARDBUS_IO 0x4000
-void pcibios_config_init(void);
-struct pci_bus * pcibios_scan_root(int bus);
-
-struct irq_routing_table *pcibios_get_irq_routing_table(void);
-int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
-
/* Dynamic DMA mapping stuff.
* i386 has everything mapped statically.
*/
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 8c4b37f6be3d..915531ede6a5 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -29,8 +29,6 @@ struct pci_vector_struct {
#define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM 0x10000000
-void pcibios_config_init(void);
-
/*
* PCI_DMA_BUS_IS_PHYS should be set to 1 if there is _necessarily_ a direct
* correspondence between device bus addresses and CPU physical addresses.
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.h b/arch/mn10300/unit-asb2305/pci-asb2305.h
index 96c484b12226..0667f613b023 100644
--- a/arch/mn10300/unit-asb2305/pci-asb2305.h
+++ b/arch/mn10300/unit-asb2305/pci-asb2305.h
@@ -30,9 +30,6 @@ extern void pcibios_resource_survey(void);
extern struct pci_ops *pci_root_ops;
-extern struct irq_routing_table *pcibios_get_irq_routing_table(void);
-extern int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
-
/* pci-irq.c */
struct irq_info {
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 645019085bb8..53873a875c01 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -88,7 +88,6 @@ extern unsigned long pci_mem_start;
#define PCIBIOS_MIN_CARDBUS_IO 0x4000
extern int pcibios_enabled;
-void pcibios_config_init(void);
void pcibios_scan_root(int bus);
struct irq_routing_table *pcibios_get_irq_routing_table(void);
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 3/4] PCI: Remove unused declarations
2017-10-05 20:38 ` [PATCH 3/4] PCI: Remove unused declarations Bjorn Helgaas
@ 2017-10-05 20:57 ` Thomas Gleixner
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Gleixner @ 2017-10-05 20:57 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Richard Henderson,
Chris Zankel, Tony Luck, linux-cris-kernel, linux-parisc,
Ralf Baechle, linux-alpha, linuxppc-dev, David S. Miller
On Thu, 5 Oct 2017, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> Remove these unused declarations:
>
> pcibios_config_init() # never defined anywhere
> pcibios_scan_root() # only defined by x86
> pcibios_get_irq_routing_table() # only defined by x86
> pcibios_set_irq_routing() # only defined by x86
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 4/4] alpha/PCI: Make pdev_save_srm_config() static
2017-10-05 20:38 [PATCH 0/4] PCI: Cleanup unused stuff Bjorn Helgaas
` (2 preceding siblings ...)
2017-10-05 20:38 ` [PATCH 3/4] PCI: Remove unused declarations Bjorn Helgaas
@ 2017-10-05 20:39 ` Bjorn Helgaas
2017-10-07 8:58 ` [PATCH 0/4] PCI: Cleanup unused stuff Ingo Molnar
4 siblings, 0 replies; 12+ messages in thread
From: Bjorn Helgaas @ 2017-10-05 20:39 UTC (permalink / raw)
To: linux-pci
Cc: linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Thomas Gleixner,
Richard Henderson, Chris Zankel, Tony Luck, linux-cris-kernel,
linux-parisc, Ralf Baechle, linux-alpha, linuxppc-dev,
David S. Miller
From: Bjorn Helgaas <bhelgaas@google.com>
pdev_save_srm_config() and struct pdev_srm_saved_conf are only used in
arch/alpha/kernel/pci.c, so make them static there.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
arch/alpha/kernel/pci.c | 11 ++++++++++-
arch/alpha/kernel/pci_impl.h | 8 --------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 564114eb85e1..16b67621a0d5 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -196,9 +196,16 @@ pcibios_init(void)
subsys_initcall(pcibios_init);
#ifdef ALPHA_RESTORE_SRM_SETUP
+/* Store PCI device configuration left by SRM here. */
+struct pdev_srm_saved_conf
+{
+ struct pdev_srm_saved_conf *next;
+ struct pci_dev *dev;
+};
+
static struct pdev_srm_saved_conf *srm_saved_configs;
-void pdev_save_srm_config(struct pci_dev *dev)
+static void pdev_save_srm_config(struct pci_dev *dev)
{
struct pdev_srm_saved_conf *tmp;
static int printed = 0;
@@ -238,6 +245,8 @@ pci_restore_srm_config(void)
pci_restore_state(tmp->dev);
}
}
+#else
+#define pdev_save_srm_config(dev) do {} while (0)
#endif
void pcibios_fixup_bus(struct pci_bus *bus)
diff --git a/arch/alpha/kernel/pci_impl.h b/arch/alpha/kernel/pci_impl.h
index 2b0ac429f5eb..65adea0d3d78 100644
--- a/arch/alpha/kernel/pci_impl.h
+++ b/arch/alpha/kernel/pci_impl.h
@@ -156,16 +156,8 @@ struct pci_iommu_arena
#endif
#ifdef ALPHA_RESTORE_SRM_SETUP
-/* Store PCI device configuration left by SRM here. */
-struct pdev_srm_saved_conf
-{
- struct pdev_srm_saved_conf *next;
- struct pci_dev *dev;
-};
-
extern void pci_restore_srm_config(void);
#else
-#define pdev_save_srm_config(dev) do {} while (0)
#define pci_restore_srm_config() do {} while (0)
#endif
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 0/4] PCI: Cleanup unused stuff
2017-10-05 20:38 [PATCH 0/4] PCI: Cleanup unused stuff Bjorn Helgaas
` (3 preceding siblings ...)
2017-10-05 20:39 ` [PATCH 4/4] alpha/PCI: Make pdev_save_srm_config() static Bjorn Helgaas
@ 2017-10-07 8:58 ` Ingo Molnar
4 siblings, 0 replies; 12+ messages in thread
From: Ingo Molnar @ 2017-10-07 8:58 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, linux-mips, Rich Felker, linux-ia64, linux-sh,
Benjamin Herrenschmidt, David Howells, Max Filippov,
Paul Mackerras, H. Peter Anvin, sparclinux, Jesper Nilsson,
linux-am33-list, Yoshinori Sato, Michael Ellerman, Helge Deller,
x86, James E.J. Bottomley, Ingo Molnar, Matt Turner, Fenghua Yu,
linux-xtensa, Mikael Starvik, Ivan Kokshaysky, Thomas Gleixner,
Richard Henderson, Chris Zankel, Tony Luck, linux-cris-kernel,
linux-parisc, Ralf Baechle, linux-alpha, linuxppc-dev,
David S. Miller
* Bjorn Helgaas <helgaas@kernel.org> wrote:
> Sorry for the long cc list. These are pretty trivial; they just remove
> some unnecessary declarations across several arches.
>
> ---
>
> Bjorn Helgaas (4):
> PCI: Remove redundant pcibios_set_master() declarations
> PCI: Remove redundant pci_dev, pci_bus, resource declarations
> PCI: Remove unused declarations
> alpha/PCI: Make pdev_save_srm_config() static
>
>
> arch/alpha/include/asm/pci.h | 5 -----
> arch/alpha/kernel/pci.c | 11 ++++++++++-
> arch/alpha/kernel/pci_impl.h | 8 --------
> arch/cris/include/asm/pci.h | 9 ---------
> arch/frv/include/asm/pci.h | 4 ----
> arch/ia64/include/asm/pci.h | 4 ----
> arch/mips/include/asm/pci.h | 4 ----
> arch/mn10300/include/asm/pci.h | 4 ----
> arch/mn10300/unit-asb2305/pci-asb2305.h | 3 ---
> arch/parisc/include/asm/pci.h | 8 --------
> arch/powerpc/include/asm/pci.h | 2 --
> arch/sh/include/asm/pci.h | 4 ----
> arch/sparc/include/asm/pci_32.h | 2 --
> arch/x86/include/asm/pci.h | 2 --
> arch/xtensa/include/asm/pci.h | 2 --
> 15 files changed, 10 insertions(+), 62 deletions(-)
Nice cleanups! For the whole series:
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Thanks,
Ingo
^ permalink raw reply [flat|nested] 12+ messages in thread