aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-06-09 18:23:47 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-06-11 21:58:37 -0400
commit44f74c046961bd1f21b7d35baaa9165572d1e975 (patch)
treeb87f36fc4bfe78a2112bbd1f954890a6d940f913
parent3a221d17a7a031ad04242f6bc86b7dff307534f8 (diff)
drivers/net/macsonic.c: make functions static
This patch makes the following needlessly global functions static: - macsonic_init() - mac_onboard_sonic_ethernet_addr() - mac_onboard_sonic_probe() - mac_nubus_sonic_ethernet_addr() - macsonic_ident() - mac_nubus_sonic_probe() Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r--drivers/net/macsonic.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index b267161418e..e64c2086d33 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -83,9 +83,6 @@ static unsigned int sonic_debug = 1;
83 83
84static int sonic_version_printed; 84static int sonic_version_printed;
85 85
86extern int mac_onboard_sonic_probe(struct net_device* dev);
87extern int mac_nubus_sonic_probe(struct net_device* dev);
88
89/* For onboard SONIC */ 86/* For onboard SONIC */
90#define ONBOARD_SONIC_REGISTERS 0x50F0A000 87#define ONBOARD_SONIC_REGISTERS 0x50F0A000
91#define ONBOARD_SONIC_PROM_BASE 0x50f08000 88#define ONBOARD_SONIC_PROM_BASE 0x50f08000
@@ -170,7 +167,7 @@ static int macsonic_close(struct net_device* dev)
170 return err; 167 return err;
171} 168}
172 169
173int __init macsonic_init(struct net_device* dev) 170static int __init macsonic_init(struct net_device *dev)
174{ 171{
175 struct sonic_local* lp = netdev_priv(dev); 172 struct sonic_local* lp = netdev_priv(dev);
176 173
@@ -218,7 +215,7 @@ int __init macsonic_init(struct net_device* dev)
218 return 0; 215 return 0;
219} 216}
220 217
221int __init mac_onboard_sonic_ethernet_addr(struct net_device* dev) 218static int __init mac_onboard_sonic_ethernet_addr(struct net_device *dev)
222{ 219{
223 struct sonic_local *lp = netdev_priv(dev); 220 struct sonic_local *lp = netdev_priv(dev);
224 const int prom_addr = ONBOARD_SONIC_PROM_BASE; 221 const int prom_addr = ONBOARD_SONIC_PROM_BASE;
@@ -284,7 +281,7 @@ int __init mac_onboard_sonic_ethernet_addr(struct net_device* dev)
284 } else return 0; 281 } else return 0;
285} 282}
286 283
287int __init mac_onboard_sonic_probe(struct net_device* dev) 284static int __init mac_onboard_sonic_probe(struct net_device *dev)
288{ 285{
289 /* Bwahahaha */ 286 /* Bwahahaha */
290 static int once_is_more_than_enough; 287 static int once_is_more_than_enough;
@@ -405,9 +402,9 @@ int __init mac_onboard_sonic_probe(struct net_device* dev)
405 return macsonic_init(dev); 402 return macsonic_init(dev);
406} 403}
407 404
408int __init mac_nubus_sonic_ethernet_addr(struct net_device* dev, 405static int __init mac_nubus_sonic_ethernet_addr(struct net_device *dev,
409 unsigned long prom_addr, 406 unsigned long prom_addr,
410 int id) 407 int id)
411{ 408{
412 int i; 409 int i;
413 for(i = 0; i < 6; i++) 410 for(i = 0; i < 6; i++)
@@ -420,7 +417,7 @@ int __init mac_nubus_sonic_ethernet_addr(struct net_device* dev,
420 return 0; 417 return 0;
421} 418}
422 419
423int __init macsonic_ident(struct nubus_dev* ndev) 420static int __init macsonic_ident(struct nubus_dev *ndev)
424{ 421{
425 if (ndev->dr_hw == NUBUS_DRHW_ASANTE_LC && 422 if (ndev->dr_hw == NUBUS_DRHW_ASANTE_LC &&
426 ndev->dr_sw == NUBUS_DRSW_SONIC_LC) 423 ndev->dr_sw == NUBUS_DRSW_SONIC_LC)
@@ -445,7 +442,7 @@ int __init macsonic_ident(struct nubus_dev* ndev)
445 return -1; 442 return -1;
446} 443}
447 444
448int __init mac_nubus_sonic_probe(struct net_device* dev) 445static int __init mac_nubus_sonic_probe(struct net_device *dev)
449{ 446{
450 static int slots; 447 static int slots;
451 struct nubus_dev* ndev = NULL; 448 struct nubus_dev* ndev = NULL;