[PATCH] Remove never used pci_probe variable

[PATCH] Remove never used pci_probe variable

[Atsushi Nemoto]

Nobody overwrite pci_probe.  Remove it.  Also make
pcibios_assign_all_busses weak so that platform code can overwrite it.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
 arch/mips/pci/pci.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 0bd93fb..7533e3f 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -21,10 +21,6 @@
  */
 int pci_probe_only;
 
-#define PCI_ASSIGN_ALL_BUSSES	1
-
-unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES;
-
 /*
  * The PCI controller list.
  */
@@ -222,9 +218,9 @@ void pcibios_set_master(struct pci_dev *dev)
 	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
 }
 
-unsigned int pcibios_assign_all_busses(void)
+unsigned int __weak pcibios_assign_all_busses(void)
 {
-	return (pci_probe & PCI_ASSIGN_ALL_BUSSES) ? 1 : 0;
+	return 1;
 }
 
 int __weak pcibios_plat_dev_init(struct pci_dev *dev)

Re: [PATCH] Remove never used pci_probe variable

[Atsushi Nemoto]

Nobody overwrite pci_probe.  Remove it.  Also make
pcibios_assign_all_busses weak so that platform code can overwrite it.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
Revised against current linux-queue tree.

 arch/mips/pci/pci.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 9dd6e01..a3dcfd4 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -21,10 +21,6 @@
  */
 int pci_probe_only;
 
-#define PCI_ASSIGN_ALL_BUSSES	1
-
-unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES;
-
 /*
  * The PCI controller list.
  */
@@ -221,9 +217,9 @@ void pcibios_set_master(struct pci_dev *dev)
 	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
 }
 
-unsigned int pcibios_assign_all_busses(void)
+unsigned int __weak pcibios_assign_all_busses(void)
 {
-	return (pci_probe & PCI_ASSIGN_ALL_BUSSES) ? 1 : 0;
+	return 1;
 }
 
 int __weak pcibios_plat_dev_init(struct pci_dev *dev)

Re: [PATCH] Remove never used pci_probe variable

[Ralf Baechle]

On Tue, Jul 08, 2008 at 01:14:26AM +0900, Atsushi Nemoto wrote:

> Nobody overwrite pci_probe.  Remove it.  Also make
> pcibios_assign_all_busses weak so that platform code can overwrite it.

> diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
> index 9dd6e01..a3dcfd4 100644
> --- a/arch/mips/pci/pci.c
> +++ b/arch/mips/pci/pci.c
> @@ -21,10 +21,6 @@
>   */
>  int pci_probe_only;
>  
> -#define PCI_ASSIGN_ALL_BUSSES	1
> -
> -unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES;
> -
>  /*
>   * The PCI controller list.
>   */
> @@ -221,9 +217,9 @@ void pcibios_set_master(struct pci_dev *dev)
>  	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
>  }
>  
> -unsigned int pcibios_assign_all_busses(void)
> +unsigned int __weak pcibios_assign_all_busses(void)
>  {
> -	return (pci_probe & PCI_ASSIGN_ALL_BUSSES) ? 1 : 0;
> +	return 1;
>  }
>  
>  int __weak pcibios_plat_dev_init(struct pci_dev *dev)

I think real problem here is that we have two variables which both serve the
same purpose, pci_probe_only and pci_probe, no?  Not entirely sure here
because the alpha defines:

arch/alpha/include/asm/pci.h:#define pcibios_assign_all_busses()        1

yet it has pci_probe_only ...

  Ralf

Re: [PATCH] Remove never used pci_probe variable

[Atsushi Nemoto]

On Wed, 27 Aug 2008 10:19:35 +0100, Ralf Baechle <ralf@linux-mips.org> wrote:
> I think real problem here is that we have two variables which both serve the
> same purpose, pci_probe_only and pci_probe, no?  Not entirely sure here
> because the alpha defines:
> 
> arch/alpha/include/asm/pci.h:#define pcibios_assign_all_busses()        1
> 
> yet it has pci_probe_only ...

I'm not sure pci_probe and pci_probe_only have same purpose... My
patch is just an cleanup and does not change current behaviour.

Real users of pci_probe_only might have some opinions ;)
---
Atsushi Nemoto

Re: [PATCH] Remove never used pci_probe variable

[Thomas Bogendoerfer]

On Wed, Aug 27, 2008 at 10:19:35AM +0100, Ralf Baechle wrote:
> I think real problem here is that we have two variables which both serve the
> same purpose, pci_probe_only and pci_probe, no?  Not entirely sure here
> because the alpha defines:
> 
> arch/alpha/include/asm/pci.h:#define pcibios_assign_all_busses()        1
> 
> yet it has pci_probe_only ...

as I found no code overwriting pci_probe under arch/mips, we could
remove pci_probe and use the same #define as alpha does.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessary a
good idea.                                                [ RFC1925, 2.3 ]