Skip to content

Commit 44f74c0

Browse files
AdrianBunkJeff Garzik
authored andcommitted
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 <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
1 parent 3a221d1 commit 44f74c0

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

drivers/net/macsonic.c

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ static unsigned int sonic_debug = 1;
8383

8484
static int sonic_version_printed;
8585

86-
extern int mac_onboard_sonic_probe(struct net_device* dev);
87-
extern int mac_nubus_sonic_probe(struct net_device* dev);
88-
8986
/* For onboard SONIC */
9087
#define ONBOARD_SONIC_REGISTERS 0x50F0A000
9188
#define ONBOARD_SONIC_PROM_BASE 0x50f08000
@@ -170,7 +167,7 @@ static int macsonic_close(struct net_device* dev)
170167
return err;
171168
}
172169

173-
int __init macsonic_init(struct net_device* dev)
170+
static int __init macsonic_init(struct net_device *dev)
174171
{
175172
struct sonic_local* lp = netdev_priv(dev);
176173

@@ -218,7 +215,7 @@ int __init macsonic_init(struct net_device* dev)
218215
return 0;
219216
}
220217

221-
int __init mac_onboard_sonic_ethernet_addr(struct net_device* dev)
218+
static int __init mac_onboard_sonic_ethernet_addr(struct net_device *dev)
222219
{
223220
struct sonic_local *lp = netdev_priv(dev);
224221
const int prom_addr = ONBOARD_SONIC_PROM_BASE;
@@ -284,7 +281,7 @@ int __init mac_onboard_sonic_ethernet_addr(struct net_device* dev)
284281
} else return 0;
285282
}
286283

287-
int __init mac_onboard_sonic_probe(struct net_device* dev)
284+
static int __init mac_onboard_sonic_probe(struct net_device *dev)
288285
{
289286
/* Bwahahaha */
290287
static int once_is_more_than_enough;
@@ -405,9 +402,9 @@ int __init mac_onboard_sonic_probe(struct net_device* dev)
405402
return macsonic_init(dev);
406403
}
407404

408-
int __init mac_nubus_sonic_ethernet_addr(struct net_device* dev,
409-
unsigned long prom_addr,
410-
int id)
405+
static int __init mac_nubus_sonic_ethernet_addr(struct net_device *dev,
406+
unsigned long prom_addr,
407+
int id)
411408
{
412409
int i;
413410
for(i = 0; i < 6; i++)
@@ -420,7 +417,7 @@ int __init mac_nubus_sonic_ethernet_addr(struct net_device* dev,
420417
return 0;
421418
}
422419

423-
int __init macsonic_ident(struct nubus_dev* ndev)
420+
static int __init macsonic_ident(struct nubus_dev *ndev)
424421
{
425422
if (ndev->dr_hw == NUBUS_DRHW_ASANTE_LC &&
426423
ndev->dr_sw == NUBUS_DRSW_SONIC_LC)
@@ -445,7 +442,7 @@ int __init macsonic_ident(struct nubus_dev* ndev)
445442
return -1;
446443
}
447444

448-
int __init mac_nubus_sonic_probe(struct net_device* dev)
445+
static int __init mac_nubus_sonic_probe(struct net_device *dev)
449446
{
450447
static int slots;
451448
struct nubus_dev* ndev = NULL;

0 commit comments

Comments
 (0)