diff options
-rw-r--r-- | drivers/net/ps3_gelic_net.c | 22 | ||||
-rw-r--r-- | drivers/net/ps3_gelic_wireless.c | 6 |
2 files changed, 15 insertions, 13 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 2b38f39924a6..d1a5fb4d6acb 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
@@ -214,9 +214,10 @@ static void gelic_card_free_chain(struct gelic_card *card, | |||
214 | * | 214 | * |
215 | * returns 0 on success, <0 on failure | 215 | * returns 0 on success, <0 on failure |
216 | */ | 216 | */ |
217 | static int gelic_card_init_chain(struct gelic_card *card, | 217 | static int __devinit gelic_card_init_chain(struct gelic_card *card, |
218 | struct gelic_descr_chain *chain, | 218 | struct gelic_descr_chain *chain, |
219 | struct gelic_descr *start_descr, int no) | 219 | struct gelic_descr *start_descr, |
220 | int no) | ||
220 | { | 221 | { |
221 | int i; | 222 | int i; |
222 | struct gelic_descr *descr; | 223 | struct gelic_descr *descr; |
@@ -407,7 +408,7 @@ rewind: | |||
407 | * | 408 | * |
408 | * returns 0 on success, < 0 on failure | 409 | * returns 0 on success, < 0 on failure |
409 | */ | 410 | */ |
410 | static int gelic_card_alloc_rx_skbs(struct gelic_card *card) | 411 | static int __devinit gelic_card_alloc_rx_skbs(struct gelic_card *card) |
411 | { | 412 | { |
412 | struct gelic_descr_chain *chain; | 413 | struct gelic_descr_chain *chain; |
413 | int ret; | 414 | int ret; |
@@ -1422,8 +1423,8 @@ static const struct net_device_ops gelic_netdevice_ops = { | |||
1422 | * | 1423 | * |
1423 | * fills out function pointers in the net_device structure | 1424 | * fills out function pointers in the net_device structure |
1424 | */ | 1425 | */ |
1425 | static void gelic_ether_setup_netdev_ops(struct net_device *netdev, | 1426 | static void __devinit gelic_ether_setup_netdev_ops(struct net_device *netdev, |
1426 | struct napi_struct *napi) | 1427 | struct napi_struct *napi) |
1427 | { | 1428 | { |
1428 | netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT; | 1429 | netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT; |
1429 | /* NAPI */ | 1430 | /* NAPI */ |
@@ -1443,7 +1444,8 @@ static void gelic_ether_setup_netdev_ops(struct net_device *netdev, | |||
1443 | * gelic_ether_setup_netdev initializes the net_device structure | 1444 | * gelic_ether_setup_netdev initializes the net_device structure |
1444 | * and register it. | 1445 | * and register it. |
1445 | **/ | 1446 | **/ |
1446 | int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card) | 1447 | int __devinit gelic_net_setup_netdev(struct net_device *netdev, |
1448 | struct gelic_card *card) | ||
1447 | { | 1449 | { |
1448 | int status; | 1450 | int status; |
1449 | u64 v1, v2; | 1451 | u64 v1, v2; |
@@ -1491,7 +1493,7 @@ int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card) | |||
1491 | * the card and net_device structures are linked to each other | 1493 | * the card and net_device structures are linked to each other |
1492 | */ | 1494 | */ |
1493 | #define GELIC_ALIGN (32) | 1495 | #define GELIC_ALIGN (32) |
1494 | static struct gelic_card *gelic_alloc_card_net(struct net_device **netdev) | 1496 | static struct gelic_card * __devinit gelic_alloc_card_net(struct net_device **netdev) |
1495 | { | 1497 | { |
1496 | struct gelic_card *card; | 1498 | struct gelic_card *card; |
1497 | struct gelic_port *port; | 1499 | struct gelic_port *port; |
@@ -1542,7 +1544,7 @@ static struct gelic_card *gelic_alloc_card_net(struct net_device **netdev) | |||
1542 | return card; | 1544 | return card; |
1543 | } | 1545 | } |
1544 | 1546 | ||
1545 | static void gelic_card_get_vlan_info(struct gelic_card *card) | 1547 | static void __devinit gelic_card_get_vlan_info(struct gelic_card *card) |
1546 | { | 1548 | { |
1547 | u64 v1, v2; | 1549 | u64 v1, v2; |
1548 | int status; | 1550 | int status; |
@@ -1616,7 +1618,7 @@ static void gelic_card_get_vlan_info(struct gelic_card *card) | |||
1616 | /** | 1618 | /** |
1617 | * ps3_gelic_driver_probe - add a device to the control of this driver | 1619 | * ps3_gelic_driver_probe - add a device to the control of this driver |
1618 | */ | 1620 | */ |
1619 | static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) | 1621 | static int __devinit ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) |
1620 | { | 1622 | { |
1621 | struct gelic_card *card; | 1623 | struct gelic_card *card; |
1622 | struct net_device *netdev; | 1624 | struct net_device *netdev; |
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c index 4f3ada622f9b..b6b3ca9bdb21 100644 --- a/drivers/net/ps3_gelic_wireless.c +++ b/drivers/net/ps3_gelic_wireless.c | |||
@@ -2442,7 +2442,7 @@ static const struct iw_handler_def gelic_wl_wext_handler_def = { | |||
2442 | #endif | 2442 | #endif |
2443 | }; | 2443 | }; |
2444 | 2444 | ||
2445 | static struct net_device *gelic_wl_alloc(struct gelic_card *card) | 2445 | static struct net_device * __devinit gelic_wl_alloc(struct gelic_card *card) |
2446 | { | 2446 | { |
2447 | struct net_device *netdev; | 2447 | struct net_device *netdev; |
2448 | struct gelic_port *port; | 2448 | struct gelic_port *port; |
@@ -2722,7 +2722,7 @@ static struct ethtool_ops gelic_wl_ethtool_ops = { | |||
2722 | .set_rx_csum = gelic_net_set_rx_csum, | 2722 | .set_rx_csum = gelic_net_set_rx_csum, |
2723 | }; | 2723 | }; |
2724 | 2724 | ||
2725 | static void gelic_wl_setup_netdev_ops(struct net_device *netdev) | 2725 | static void __devinit gelic_wl_setup_netdev_ops(struct net_device *netdev) |
2726 | { | 2726 | { |
2727 | struct gelic_wl_info *wl; | 2727 | struct gelic_wl_info *wl; |
2728 | wl = port_wl(netdev_priv(netdev)); | 2728 | wl = port_wl(netdev_priv(netdev)); |
@@ -2738,7 +2738,7 @@ static void gelic_wl_setup_netdev_ops(struct net_device *netdev) | |||
2738 | /* | 2738 | /* |
2739 | * driver probe/remove | 2739 | * driver probe/remove |
2740 | */ | 2740 | */ |
2741 | int gelic_wl_driver_probe(struct gelic_card *card) | 2741 | int __devinit gelic_wl_driver_probe(struct gelic_card *card) |
2742 | { | 2742 | { |
2743 | int ret; | 2743 | int ret; |
2744 | struct net_device *netdev; | 2744 | struct net_device *netdev; |