aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ps3_gelic_net.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ps3_gelic_net.c')
-rw-r--r--drivers/net/ps3_gelic_net.c22
1 files changed, 12 insertions, 10 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 */
217static int gelic_card_init_chain(struct gelic_card *card, 217static 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 */
410static int gelic_card_alloc_rx_skbs(struct gelic_card *card) 411static 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 */
1425static void gelic_ether_setup_netdev_ops(struct net_device *netdev, 1426static 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 **/
1446int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card) 1447int __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)
1494static struct gelic_card *gelic_alloc_card_net(struct net_device **netdev) 1496static 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
1545static void gelic_card_get_vlan_info(struct gelic_card *card) 1547static 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 */
1619static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) 1621static 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;