diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-05-28 18:17:39 +0400 |
|---|---|---|
| committer | Lennert Buytenhek <buytenh@marvell.com> | 2008-06-23 00:44:48 +0400 |
| commit | 2850a037734eac0af2e6abc4e8be986c3edfd834 (patch) | |
| tree | ab0e8a470dc8464fff2452b2580cc41b397a8ccc /arch | |
| parent | b206ed0462b7112d07bb9f245bf49f5e95ff174a (diff) | |
| download | linux-2850a037734eac0af2e6abc4e8be986c3edfd834.tar.xz | |
[ARM] Orion: avoid setting ->force_phy_addr
The mv643xx_eth platform data field ->force_phy_addr only needs
to be set if the passed-in ->phy_addr field is zero (to distinguish
the case of not having specified a phy address
(force_phy_addr = 0) from the case where a phy address of zero needs
to be used (force_phy_addr = 1.))
Also, the ->force_phy_addr field will hopefully disappear in a
future mv643xx_eth reorganisation.
Therefore, this patch deletes the ->force_phy_addr field initialiser
from all Orion board code.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-orion5x/db88f5281-setup.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/dns323-setup.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/kurobox_pro-setup.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/rd88f5182-setup.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/ts209-setup.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c index 3fee400c81ab..00ad36ade57e 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion5x/db88f5281-setup.c @@ -286,7 +286,6 @@ subsys_initcall(db88f5281_pci_init); ****************************************************************************/ static struct mv643xx_eth_platform_data db88f5281_eth_data = { .phy_addr = 8, - .force_phy_addr = 1, }; /***************************************************************************** diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index ad810aa5fff5..64730a045ff6 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c @@ -80,7 +80,6 @@ subsys_initcall(dns323_pci_init); static struct mv643xx_eth_platform_data dns323_eth_data = { .phy_addr = 8, - .force_phy_addr = 1, }; /**************************************************************************** diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index b8414f6e0e83..8b4a8aa5a836 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c @@ -158,7 +158,6 @@ subsys_initcall(kurobox_pro_pci_init); static struct mv643xx_eth_platform_data kurobox_pro_eth_data = { .phy_addr = 8, - .force_phy_addr = 1, }; /***************************************************************************** diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c index 44ad5de87b79..10ae62864269 100644 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c @@ -222,7 +222,6 @@ subsys_initcall(rd88f5182_pci_init); static struct mv643xx_eth_platform_data rd88f5182_eth_data = { .phy_addr = 8, - .force_phy_addr = 1, }; /***************************************************************************** diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index 5ad7ad9b9461..80b62329f586 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c @@ -191,7 +191,6 @@ subsys_initcall(qnap_ts209_pci_init); static struct mv643xx_eth_platform_data qnap_ts209_eth_data = { .phy_addr = 8, - .force_phy_addr = 1, }; static int __init parse_hex_nibble(char n) |