diff options
Diffstat (limited to 'drivers/net/ucc_geth.c')
-rw-r--r-- | drivers/net/ucc_geth.c | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 8f944e57fd55..c87747bb24c5 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -400,7 +400,7 @@ static struct enet_addr_container *get_enet_addr_container(void) | |||
400 | enet_addr_cont = kmalloc(sizeof(struct enet_addr_container), GFP_KERNEL); | 400 | enet_addr_cont = kmalloc(sizeof(struct enet_addr_container), GFP_KERNEL); |
401 | if (!enet_addr_cont) { | 401 | if (!enet_addr_cont) { |
402 | ugeth_err("%s: No memory for enet_addr_container object.", | 402 | ugeth_err("%s: No memory for enet_addr_container object.", |
403 | __FUNCTION__); | 403 | __func__); |
404 | return NULL; | 404 | return NULL; |
405 | } | 405 | } |
406 | 406 | ||
@@ -427,7 +427,7 @@ static int hw_add_addr_in_paddr(struct ucc_geth_private *ugeth, | |||
427 | struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; | 427 | struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; |
428 | 428 | ||
429 | if (!(paddr_num < NUM_OF_PADDRS)) { | 429 | if (!(paddr_num < NUM_OF_PADDRS)) { |
430 | ugeth_warn("%s: Illegal paddr_num.", __FUNCTION__); | 430 | ugeth_warn("%s: Illegal paddr_num.", __func__); |
431 | return -EINVAL; | 431 | return -EINVAL; |
432 | } | 432 | } |
433 | 433 | ||
@@ -447,7 +447,7 @@ static int hw_clear_addr_in_paddr(struct ucc_geth_private *ugeth, u8 paddr_num) | |||
447 | struct ucc_geth_82xx_address_filtering_pram __iomem *p_82xx_addr_filt; | 447 | struct ucc_geth_82xx_address_filtering_pram __iomem *p_82xx_addr_filt; |
448 | 448 | ||
449 | if (!(paddr_num < NUM_OF_PADDRS)) { | 449 | if (!(paddr_num < NUM_OF_PADDRS)) { |
450 | ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__); | 450 | ugeth_warn("%s: Illagel paddr_num.", __func__); |
451 | return -EINVAL; | 451 | return -EINVAL; |
452 | } | 452 | } |
453 | 453 | ||
@@ -1441,7 +1441,7 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth) | |||
1441 | u32 upsmr, maccfg2, tbiBaseAddress; | 1441 | u32 upsmr, maccfg2, tbiBaseAddress; |
1442 | u16 value; | 1442 | u16 value; |
1443 | 1443 | ||
1444 | ugeth_vdbg("%s: IN", __FUNCTION__); | 1444 | ugeth_vdbg("%s: IN", __func__); |
1445 | 1445 | ||
1446 | ug_info = ugeth->ug_info; | 1446 | ug_info = ugeth->ug_info; |
1447 | ug_regs = ugeth->ug_regs; | 1447 | ug_regs = ugeth->ug_regs; |
@@ -1504,7 +1504,7 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth) | |||
1504 | if (ret_val != 0) { | 1504 | if (ret_val != 0) { |
1505 | if (netif_msg_probe(ugeth)) | 1505 | if (netif_msg_probe(ugeth)) |
1506 | ugeth_err("%s: Preamble length must be between 3 and 7 inclusive.", | 1506 | ugeth_err("%s: Preamble length must be between 3 and 7 inclusive.", |
1507 | __FUNCTION__); | 1507 | __func__); |
1508 | return ret_val; | 1508 | return ret_val; |
1509 | } | 1509 | } |
1510 | 1510 | ||
@@ -1744,7 +1744,7 @@ static int ugeth_enable(struct ucc_geth_private *ugeth, enum comm_dir mode) | |||
1744 | /* check if the UCC number is in range. */ | 1744 | /* check if the UCC number is in range. */ |
1745 | if (ugeth->ug_info->uf_info.ucc_num >= UCC_MAX_NUM) { | 1745 | if (ugeth->ug_info->uf_info.ucc_num >= UCC_MAX_NUM) { |
1746 | if (netif_msg_probe(ugeth)) | 1746 | if (netif_msg_probe(ugeth)) |
1747 | ugeth_err("%s: ucc_num out of range.", __FUNCTION__); | 1747 | ugeth_err("%s: ucc_num out of range.", __func__); |
1748 | return -EINVAL; | 1748 | return -EINVAL; |
1749 | } | 1749 | } |
1750 | 1750 | ||
@@ -1773,7 +1773,7 @@ static int ugeth_disable(struct ucc_geth_private * ugeth, enum comm_dir mode) | |||
1773 | /* check if the UCC number is in range. */ | 1773 | /* check if the UCC number is in range. */ |
1774 | if (ugeth->ug_info->uf_info.ucc_num >= UCC_MAX_NUM) { | 1774 | if (ugeth->ug_info->uf_info.ucc_num >= UCC_MAX_NUM) { |
1775 | if (netif_msg_probe(ugeth)) | 1775 | if (netif_msg_probe(ugeth)) |
1776 | ugeth_err("%s: ucc_num out of range.", __FUNCTION__); | 1776 | ugeth_err("%s: ucc_num out of range.", __func__); |
1777 | return -EINVAL; | 1777 | return -EINVAL; |
1778 | } | 1778 | } |
1779 | 1779 | ||
@@ -2062,7 +2062,7 @@ static int ugeth_82xx_filtering_add_addr_in_paddr(struct ucc_geth_private *ugeth | |||
2062 | ugeth_warn | 2062 | ugeth_warn |
2063 | ("%s: multicast address added to paddr will have no " | 2063 | ("%s: multicast address added to paddr will have no " |
2064 | "effect - is this what you wanted?", | 2064 | "effect - is this what you wanted?", |
2065 | __FUNCTION__); | 2065 | __func__); |
2066 | 2066 | ||
2067 | ugeth->indAddrRegUsed[paddr_num] = 1; /* mark this paddr as used */ | 2067 | ugeth->indAddrRegUsed[paddr_num] = 1; /* mark this paddr as used */ |
2068 | /* store address in our database */ | 2068 | /* store address in our database */ |
@@ -2278,7 +2278,7 @@ static void ucc_geth_stop(struct ucc_geth_private *ugeth) | |||
2278 | struct phy_device *phydev = ugeth->phydev; | 2278 | struct phy_device *phydev = ugeth->phydev; |
2279 | u32 tempval; | 2279 | u32 tempval; |
2280 | 2280 | ||
2281 | ugeth_vdbg("%s: IN", __FUNCTION__); | 2281 | ugeth_vdbg("%s: IN", __func__); |
2282 | 2282 | ||
2283 | /* Disable the controller */ | 2283 | /* Disable the controller */ |
2284 | ugeth_disable(ugeth, COMM_DIR_RX_AND_TX); | 2284 | ugeth_disable(ugeth, COMM_DIR_RX_AND_TX); |
@@ -2315,7 +2315,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) | |||
2315 | (uf_info->bd_mem_part == MEM_PART_MURAM))) { | 2315 | (uf_info->bd_mem_part == MEM_PART_MURAM))) { |
2316 | if (netif_msg_probe(ugeth)) | 2316 | if (netif_msg_probe(ugeth)) |
2317 | ugeth_err("%s: Bad memory partition value.", | 2317 | ugeth_err("%s: Bad memory partition value.", |
2318 | __FUNCTION__); | 2318 | __func__); |
2319 | return -EINVAL; | 2319 | return -EINVAL; |
2320 | } | 2320 | } |
2321 | 2321 | ||
@@ -2327,7 +2327,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) | |||
2327 | if (netif_msg_probe(ugeth)) | 2327 | if (netif_msg_probe(ugeth)) |
2328 | ugeth_err | 2328 | ugeth_err |
2329 | ("%s: Rx BD ring length must be multiple of 4, no smaller than 8.", | 2329 | ("%s: Rx BD ring length must be multiple of 4, no smaller than 8.", |
2330 | __FUNCTION__); | 2330 | __func__); |
2331 | return -EINVAL; | 2331 | return -EINVAL; |
2332 | } | 2332 | } |
2333 | } | 2333 | } |
@@ -2338,7 +2338,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) | |||
2338 | if (netif_msg_probe(ugeth)) | 2338 | if (netif_msg_probe(ugeth)) |
2339 | ugeth_err | 2339 | ugeth_err |
2340 | ("%s: Tx BD ring length must be no smaller than 2.", | 2340 | ("%s: Tx BD ring length must be no smaller than 2.", |
2341 | __FUNCTION__); | 2341 | __func__); |
2342 | return -EINVAL; | 2342 | return -EINVAL; |
2343 | } | 2343 | } |
2344 | } | 2344 | } |
@@ -2349,21 +2349,21 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) | |||
2349 | if (netif_msg_probe(ugeth)) | 2349 | if (netif_msg_probe(ugeth)) |
2350 | ugeth_err | 2350 | ugeth_err |
2351 | ("%s: max_rx_buf_length must be non-zero multiple of 128.", | 2351 | ("%s: max_rx_buf_length must be non-zero multiple of 128.", |
2352 | __FUNCTION__); | 2352 | __func__); |
2353 | return -EINVAL; | 2353 | return -EINVAL; |
2354 | } | 2354 | } |
2355 | 2355 | ||
2356 | /* num Tx queues */ | 2356 | /* num Tx queues */ |
2357 | if (ug_info->numQueuesTx > NUM_TX_QUEUES) { | 2357 | if (ug_info->numQueuesTx > NUM_TX_QUEUES) { |
2358 | if (netif_msg_probe(ugeth)) | 2358 | if (netif_msg_probe(ugeth)) |
2359 | ugeth_err("%s: number of tx queues too large.", __FUNCTION__); | 2359 | ugeth_err("%s: number of tx queues too large.", __func__); |
2360 | return -EINVAL; | 2360 | return -EINVAL; |
2361 | } | 2361 | } |
2362 | 2362 | ||
2363 | /* num Rx queues */ | 2363 | /* num Rx queues */ |
2364 | if (ug_info->numQueuesRx > NUM_RX_QUEUES) { | 2364 | if (ug_info->numQueuesRx > NUM_RX_QUEUES) { |
2365 | if (netif_msg_probe(ugeth)) | 2365 | if (netif_msg_probe(ugeth)) |
2366 | ugeth_err("%s: number of rx queues too large.", __FUNCTION__); | 2366 | ugeth_err("%s: number of rx queues too large.", __func__); |
2367 | return -EINVAL; | 2367 | return -EINVAL; |
2368 | } | 2368 | } |
2369 | 2369 | ||
@@ -2374,7 +2374,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) | |||
2374 | ugeth_err | 2374 | ugeth_err |
2375 | ("%s: VLAN priority table entry must not be" | 2375 | ("%s: VLAN priority table entry must not be" |
2376 | " larger than number of Rx queues.", | 2376 | " larger than number of Rx queues.", |
2377 | __FUNCTION__); | 2377 | __func__); |
2378 | return -EINVAL; | 2378 | return -EINVAL; |
2379 | } | 2379 | } |
2380 | } | 2380 | } |
@@ -2386,7 +2386,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) | |||
2386 | ugeth_err | 2386 | ugeth_err |
2387 | ("%s: IP priority table entry must not be" | 2387 | ("%s: IP priority table entry must not be" |
2388 | " larger than number of Rx queues.", | 2388 | " larger than number of Rx queues.", |
2389 | __FUNCTION__); | 2389 | __func__); |
2390 | return -EINVAL; | 2390 | return -EINVAL; |
2391 | } | 2391 | } |
2392 | } | 2392 | } |
@@ -2394,7 +2394,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) | |||
2394 | if (ug_info->cam && !ug_info->ecamptr) { | 2394 | if (ug_info->cam && !ug_info->ecamptr) { |
2395 | if (netif_msg_probe(ugeth)) | 2395 | if (netif_msg_probe(ugeth)) |
2396 | ugeth_err("%s: If cam mode is chosen, must supply cam ptr.", | 2396 | ugeth_err("%s: If cam mode is chosen, must supply cam ptr.", |
2397 | __FUNCTION__); | 2397 | __func__); |
2398 | return -EINVAL; | 2398 | return -EINVAL; |
2399 | } | 2399 | } |
2400 | 2400 | ||
@@ -2404,7 +2404,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) | |||
2404 | if (netif_msg_probe(ugeth)) | 2404 | if (netif_msg_probe(ugeth)) |
2405 | ugeth_err("%s: Number of station addresses greater than 1 " | 2405 | ugeth_err("%s: Number of station addresses greater than 1 " |
2406 | "not allowed in extended parsing mode.", | 2406 | "not allowed in extended parsing mode.", |
2407 | __FUNCTION__); | 2407 | __func__); |
2408 | return -EINVAL; | 2408 | return -EINVAL; |
2409 | } | 2409 | } |
2410 | 2410 | ||
@@ -2418,7 +2418,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) | |||
2418 | /* Initialize the general fast UCC block. */ | 2418 | /* Initialize the general fast UCC block. */ |
2419 | if (ucc_fast_init(uf_info, &ugeth->uccf)) { | 2419 | if (ucc_fast_init(uf_info, &ugeth->uccf)) { |
2420 | if (netif_msg_probe(ugeth)) | 2420 | if (netif_msg_probe(ugeth)) |
2421 | ugeth_err("%s: Failed to init uccf.", __FUNCTION__); | 2421 | ugeth_err("%s: Failed to init uccf.", __func__); |
2422 | ucc_geth_memclean(ugeth); | 2422 | ucc_geth_memclean(ugeth); |
2423 | return -ENOMEM; | 2423 | return -ENOMEM; |
2424 | } | 2424 | } |
@@ -2448,7 +2448,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2448 | u8 __iomem *endOfRing; | 2448 | u8 __iomem *endOfRing; |
2449 | u8 numThreadsRxNumerical, numThreadsTxNumerical; | 2449 | u8 numThreadsRxNumerical, numThreadsTxNumerical; |
2450 | 2450 | ||
2451 | ugeth_vdbg("%s: IN", __FUNCTION__); | 2451 | ugeth_vdbg("%s: IN", __func__); |
2452 | uccf = ugeth->uccf; | 2452 | uccf = ugeth->uccf; |
2453 | ug_info = ugeth->ug_info; | 2453 | ug_info = ugeth->ug_info; |
2454 | uf_info = &ug_info->uf_info; | 2454 | uf_info = &ug_info->uf_info; |
@@ -2474,7 +2474,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2474 | default: | 2474 | default: |
2475 | if (netif_msg_ifup(ugeth)) | 2475 | if (netif_msg_ifup(ugeth)) |
2476 | ugeth_err("%s: Bad number of Rx threads value.", | 2476 | ugeth_err("%s: Bad number of Rx threads value.", |
2477 | __FUNCTION__); | 2477 | __func__); |
2478 | ucc_geth_memclean(ugeth); | 2478 | ucc_geth_memclean(ugeth); |
2479 | return -EINVAL; | 2479 | return -EINVAL; |
2480 | break; | 2480 | break; |
@@ -2499,7 +2499,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2499 | default: | 2499 | default: |
2500 | if (netif_msg_ifup(ugeth)) | 2500 | if (netif_msg_ifup(ugeth)) |
2501 | ugeth_err("%s: Bad number of Tx threads value.", | 2501 | ugeth_err("%s: Bad number of Tx threads value.", |
2502 | __FUNCTION__); | 2502 | __func__); |
2503 | ucc_geth_memclean(ugeth); | 2503 | ucc_geth_memclean(ugeth); |
2504 | return -EINVAL; | 2504 | return -EINVAL; |
2505 | break; | 2505 | break; |
@@ -2553,7 +2553,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2553 | if (ret_val != 0) { | 2553 | if (ret_val != 0) { |
2554 | if (netif_msg_ifup(ugeth)) | 2554 | if (netif_msg_ifup(ugeth)) |
2555 | ugeth_err("%s: IPGIFG initialization parameter too large.", | 2555 | ugeth_err("%s: IPGIFG initialization parameter too large.", |
2556 | __FUNCTION__); | 2556 | __func__); |
2557 | ucc_geth_memclean(ugeth); | 2557 | ucc_geth_memclean(ugeth); |
2558 | return ret_val; | 2558 | return ret_val; |
2559 | } | 2559 | } |
@@ -2571,7 +2571,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2571 | if (ret_val != 0) { | 2571 | if (ret_val != 0) { |
2572 | if (netif_msg_ifup(ugeth)) | 2572 | if (netif_msg_ifup(ugeth)) |
2573 | ugeth_err("%s: Half Duplex initialization parameter too large.", | 2573 | ugeth_err("%s: Half Duplex initialization parameter too large.", |
2574 | __FUNCTION__); | 2574 | __func__); |
2575 | ucc_geth_memclean(ugeth); | 2575 | ucc_geth_memclean(ugeth); |
2576 | return ret_val; | 2576 | return ret_val; |
2577 | } | 2577 | } |
@@ -2626,7 +2626,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2626 | if (netif_msg_ifup(ugeth)) | 2626 | if (netif_msg_ifup(ugeth)) |
2627 | ugeth_err | 2627 | ugeth_err |
2628 | ("%s: Can not allocate memory for Tx bd rings.", | 2628 | ("%s: Can not allocate memory for Tx bd rings.", |
2629 | __FUNCTION__); | 2629 | __func__); |
2630 | ucc_geth_memclean(ugeth); | 2630 | ucc_geth_memclean(ugeth); |
2631 | return -ENOMEM; | 2631 | return -ENOMEM; |
2632 | } | 2632 | } |
@@ -2662,7 +2662,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2662 | if (netif_msg_ifup(ugeth)) | 2662 | if (netif_msg_ifup(ugeth)) |
2663 | ugeth_err | 2663 | ugeth_err |
2664 | ("%s: Can not allocate memory for Rx bd rings.", | 2664 | ("%s: Can not allocate memory for Rx bd rings.", |
2665 | __FUNCTION__); | 2665 | __func__); |
2666 | ucc_geth_memclean(ugeth); | 2666 | ucc_geth_memclean(ugeth); |
2667 | return -ENOMEM; | 2667 | return -ENOMEM; |
2668 | } | 2668 | } |
@@ -2678,7 +2678,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2678 | if (ugeth->tx_skbuff[j] == NULL) { | 2678 | if (ugeth->tx_skbuff[j] == NULL) { |
2679 | if (netif_msg_ifup(ugeth)) | 2679 | if (netif_msg_ifup(ugeth)) |
2680 | ugeth_err("%s: Could not allocate tx_skbuff", | 2680 | ugeth_err("%s: Could not allocate tx_skbuff", |
2681 | __FUNCTION__); | 2681 | __func__); |
2682 | ucc_geth_memclean(ugeth); | 2682 | ucc_geth_memclean(ugeth); |
2683 | return -ENOMEM; | 2683 | return -ENOMEM; |
2684 | } | 2684 | } |
@@ -2710,7 +2710,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2710 | if (ugeth->rx_skbuff[j] == NULL) { | 2710 | if (ugeth->rx_skbuff[j] == NULL) { |
2711 | if (netif_msg_ifup(ugeth)) | 2711 | if (netif_msg_ifup(ugeth)) |
2712 | ugeth_err("%s: Could not allocate rx_skbuff", | 2712 | ugeth_err("%s: Could not allocate rx_skbuff", |
2713 | __FUNCTION__); | 2713 | __func__); |
2714 | ucc_geth_memclean(ugeth); | 2714 | ucc_geth_memclean(ugeth); |
2715 | return -ENOMEM; | 2715 | return -ENOMEM; |
2716 | } | 2716 | } |
@@ -2744,7 +2744,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2744 | if (netif_msg_ifup(ugeth)) | 2744 | if (netif_msg_ifup(ugeth)) |
2745 | ugeth_err | 2745 | ugeth_err |
2746 | ("%s: Can not allocate DPRAM memory for p_tx_glbl_pram.", | 2746 | ("%s: Can not allocate DPRAM memory for p_tx_glbl_pram.", |
2747 | __FUNCTION__); | 2747 | __func__); |
2748 | ucc_geth_memclean(ugeth); | 2748 | ucc_geth_memclean(ugeth); |
2749 | return -ENOMEM; | 2749 | return -ENOMEM; |
2750 | } | 2750 | } |
@@ -2767,7 +2767,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2767 | if (netif_msg_ifup(ugeth)) | 2767 | if (netif_msg_ifup(ugeth)) |
2768 | ugeth_err | 2768 | ugeth_err |
2769 | ("%s: Can not allocate DPRAM memory for p_thread_data_tx.", | 2769 | ("%s: Can not allocate DPRAM memory for p_thread_data_tx.", |
2770 | __FUNCTION__); | 2770 | __func__); |
2771 | ucc_geth_memclean(ugeth); | 2771 | ucc_geth_memclean(ugeth); |
2772 | return -ENOMEM; | 2772 | return -ENOMEM; |
2773 | } | 2773 | } |
@@ -2797,7 +2797,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2797 | if (netif_msg_ifup(ugeth)) | 2797 | if (netif_msg_ifup(ugeth)) |
2798 | ugeth_err | 2798 | ugeth_err |
2799 | ("%s: Can not allocate DPRAM memory for p_send_q_mem_reg.", | 2799 | ("%s: Can not allocate DPRAM memory for p_send_q_mem_reg.", |
2800 | __FUNCTION__); | 2800 | __func__); |
2801 | ucc_geth_memclean(ugeth); | 2801 | ucc_geth_memclean(ugeth); |
2802 | return -ENOMEM; | 2802 | return -ENOMEM; |
2803 | } | 2803 | } |
@@ -2841,7 +2841,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2841 | if (netif_msg_ifup(ugeth)) | 2841 | if (netif_msg_ifup(ugeth)) |
2842 | ugeth_err | 2842 | ugeth_err |
2843 | ("%s: Can not allocate DPRAM memory for p_scheduler.", | 2843 | ("%s: Can not allocate DPRAM memory for p_scheduler.", |
2844 | __FUNCTION__); | 2844 | __func__); |
2845 | ucc_geth_memclean(ugeth); | 2845 | ucc_geth_memclean(ugeth); |
2846 | return -ENOMEM; | 2846 | return -ENOMEM; |
2847 | } | 2847 | } |
@@ -2892,7 +2892,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2892 | ugeth_err | 2892 | ugeth_err |
2893 | ("%s: Can not allocate DPRAM memory for" | 2893 | ("%s: Can not allocate DPRAM memory for" |
2894 | " p_tx_fw_statistics_pram.", | 2894 | " p_tx_fw_statistics_pram.", |
2895 | __FUNCTION__); | 2895 | __func__); |
2896 | ucc_geth_memclean(ugeth); | 2896 | ucc_geth_memclean(ugeth); |
2897 | return -ENOMEM; | 2897 | return -ENOMEM; |
2898 | } | 2898 | } |
@@ -2932,7 +2932,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2932 | if (netif_msg_ifup(ugeth)) | 2932 | if (netif_msg_ifup(ugeth)) |
2933 | ugeth_err | 2933 | ugeth_err |
2934 | ("%s: Can not allocate DPRAM memory for p_rx_glbl_pram.", | 2934 | ("%s: Can not allocate DPRAM memory for p_rx_glbl_pram.", |
2935 | __FUNCTION__); | 2935 | __func__); |
2936 | ucc_geth_memclean(ugeth); | 2936 | ucc_geth_memclean(ugeth); |
2937 | return -ENOMEM; | 2937 | return -ENOMEM; |
2938 | } | 2938 | } |
@@ -2954,7 +2954,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2954 | if (netif_msg_ifup(ugeth)) | 2954 | if (netif_msg_ifup(ugeth)) |
2955 | ugeth_err | 2955 | ugeth_err |
2956 | ("%s: Can not allocate DPRAM memory for p_thread_data_rx.", | 2956 | ("%s: Can not allocate DPRAM memory for p_thread_data_rx.", |
2957 | __FUNCTION__); | 2957 | __func__); |
2958 | ucc_geth_memclean(ugeth); | 2958 | ucc_geth_memclean(ugeth); |
2959 | return -ENOMEM; | 2959 | return -ENOMEM; |
2960 | } | 2960 | } |
@@ -2978,7 +2978,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
2978 | if (netif_msg_ifup(ugeth)) | 2978 | if (netif_msg_ifup(ugeth)) |
2979 | ugeth_err | 2979 | ugeth_err |
2980 | ("%s: Can not allocate DPRAM memory for" | 2980 | ("%s: Can not allocate DPRAM memory for" |
2981 | " p_rx_fw_statistics_pram.", __FUNCTION__); | 2981 | " p_rx_fw_statistics_pram.", __func__); |
2982 | ucc_geth_memclean(ugeth); | 2982 | ucc_geth_memclean(ugeth); |
2983 | return -ENOMEM; | 2983 | return -ENOMEM; |
2984 | } | 2984 | } |
@@ -3001,7 +3001,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
3001 | if (netif_msg_ifup(ugeth)) | 3001 | if (netif_msg_ifup(ugeth)) |
3002 | ugeth_err | 3002 | ugeth_err |
3003 | ("%s: Can not allocate DPRAM memory for" | 3003 | ("%s: Can not allocate DPRAM memory for" |
3004 | " p_rx_irq_coalescing_tbl.", __FUNCTION__); | 3004 | " p_rx_irq_coalescing_tbl.", __func__); |
3005 | ucc_geth_memclean(ugeth); | 3005 | ucc_geth_memclean(ugeth); |
3006 | return -ENOMEM; | 3006 | return -ENOMEM; |
3007 | } | 3007 | } |
@@ -3070,7 +3070,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
3070 | if (netif_msg_ifup(ugeth)) | 3070 | if (netif_msg_ifup(ugeth)) |
3071 | ugeth_err | 3071 | ugeth_err |
3072 | ("%s: Can not allocate DPRAM memory for p_rx_bd_qs_tbl.", | 3072 | ("%s: Can not allocate DPRAM memory for p_rx_bd_qs_tbl.", |
3073 | __FUNCTION__); | 3073 | __func__); |
3074 | ucc_geth_memclean(ugeth); | 3074 | ucc_geth_memclean(ugeth); |
3075 | return -ENOMEM; | 3075 | return -ENOMEM; |
3076 | } | 3076 | } |
@@ -3147,7 +3147,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
3147 | if (!ug_info->extendedFilteringChainPointer) { | 3147 | if (!ug_info->extendedFilteringChainPointer) { |
3148 | if (netif_msg_ifup(ugeth)) | 3148 | if (netif_msg_ifup(ugeth)) |
3149 | ugeth_err("%s: Null Extended Filtering Chain Pointer.", | 3149 | ugeth_err("%s: Null Extended Filtering Chain Pointer.", |
3150 | __FUNCTION__); | 3150 | __func__); |
3151 | ucc_geth_memclean(ugeth); | 3151 | ucc_geth_memclean(ugeth); |
3152 | return -EINVAL; | 3152 | return -EINVAL; |
3153 | } | 3153 | } |
@@ -3161,7 +3161,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
3161 | if (netif_msg_ifup(ugeth)) | 3161 | if (netif_msg_ifup(ugeth)) |
3162 | ugeth_err | 3162 | ugeth_err |
3163 | ("%s: Can not allocate DPRAM memory for" | 3163 | ("%s: Can not allocate DPRAM memory for" |
3164 | " p_exf_glbl_param.", __FUNCTION__); | 3164 | " p_exf_glbl_param.", __func__); |
3165 | ucc_geth_memclean(ugeth); | 3165 | ucc_geth_memclean(ugeth); |
3166 | return -ENOMEM; | 3166 | return -ENOMEM; |
3167 | } | 3167 | } |
@@ -3209,7 +3209,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
3209 | if (netif_msg_ifup(ugeth)) | 3209 | if (netif_msg_ifup(ugeth)) |
3210 | ugeth_err | 3210 | ugeth_err |
3211 | ("%s: Can not allocate memory for" | 3211 | ("%s: Can not allocate memory for" |
3212 | " p_UccInitEnetParamShadows.", __FUNCTION__); | 3212 | " p_UccInitEnetParamShadows.", __func__); |
3213 | ucc_geth_memclean(ugeth); | 3213 | ucc_geth_memclean(ugeth); |
3214 | return -ENOMEM; | 3214 | return -ENOMEM; |
3215 | } | 3215 | } |
@@ -3244,7 +3244,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
3244 | QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_16_BYTES)) { | 3244 | QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_16_BYTES)) { |
3245 | if (netif_msg_ifup(ugeth)) | 3245 | if (netif_msg_ifup(ugeth)) |
3246 | ugeth_err("%s: Invalid largest External Lookup Key Size.", | 3246 | ugeth_err("%s: Invalid largest External Lookup Key Size.", |
3247 | __FUNCTION__); | 3247 | __func__); |
3248 | ucc_geth_memclean(ugeth); | 3248 | ucc_geth_memclean(ugeth); |
3249 | return -EINVAL; | 3249 | return -EINVAL; |
3250 | } | 3250 | } |
@@ -3271,7 +3271,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
3271 | ug_info->riscRx, 1)) != 0) { | 3271 | ug_info->riscRx, 1)) != 0) { |
3272 | if (netif_msg_ifup(ugeth)) | 3272 | if (netif_msg_ifup(ugeth)) |
3273 | ugeth_err("%s: Can not fill p_init_enet_param_shadow.", | 3273 | ugeth_err("%s: Can not fill p_init_enet_param_shadow.", |
3274 | __FUNCTION__); | 3274 | __func__); |
3275 | ucc_geth_memclean(ugeth); | 3275 | ucc_geth_memclean(ugeth); |
3276 | return ret_val; | 3276 | return ret_val; |
3277 | } | 3277 | } |
@@ -3287,7 +3287,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
3287 | ug_info->riscTx, 0)) != 0) { | 3287 | ug_info->riscTx, 0)) != 0) { |
3288 | if (netif_msg_ifup(ugeth)) | 3288 | if (netif_msg_ifup(ugeth)) |
3289 | ugeth_err("%s: Can not fill p_init_enet_param_shadow.", | 3289 | ugeth_err("%s: Can not fill p_init_enet_param_shadow.", |
3290 | __FUNCTION__); | 3290 | __func__); |
3291 | ucc_geth_memclean(ugeth); | 3291 | ucc_geth_memclean(ugeth); |
3292 | return ret_val; | 3292 | return ret_val; |
3293 | } | 3293 | } |
@@ -3297,7 +3297,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
3297 | if ((ret_val = rx_bd_buffer_set(ugeth, (u8) i)) != 0) { | 3297 | if ((ret_val = rx_bd_buffer_set(ugeth, (u8) i)) != 0) { |
3298 | if (netif_msg_ifup(ugeth)) | 3298 | if (netif_msg_ifup(ugeth)) |
3299 | ugeth_err("%s: Can not fill Rx bds with buffers.", | 3299 | ugeth_err("%s: Can not fill Rx bds with buffers.", |
3300 | __FUNCTION__); | 3300 | __func__); |
3301 | ucc_geth_memclean(ugeth); | 3301 | ucc_geth_memclean(ugeth); |
3302 | return ret_val; | 3302 | return ret_val; |
3303 | } | 3303 | } |
@@ -3309,7 +3309,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) | |||
3309 | if (netif_msg_ifup(ugeth)) | 3309 | if (netif_msg_ifup(ugeth)) |
3310 | ugeth_err | 3310 | ugeth_err |
3311 | ("%s: Can not allocate DPRAM memory for p_init_enet_pram.", | 3311 | ("%s: Can not allocate DPRAM memory for p_init_enet_pram.", |
3312 | __FUNCTION__); | 3312 | __func__); |
3313 | ucc_geth_memclean(ugeth); | 3313 | ucc_geth_memclean(ugeth); |
3314 | return -ENOMEM; | 3314 | return -ENOMEM; |
3315 | } | 3315 | } |
@@ -3360,7 +3360,7 @@ static void ucc_geth_timeout(struct net_device *dev) | |||
3360 | { | 3360 | { |
3361 | struct ucc_geth_private *ugeth = netdev_priv(dev); | 3361 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
3362 | 3362 | ||
3363 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3363 | ugeth_vdbg("%s: IN", __func__); |
3364 | 3364 | ||
3365 | dev->stats.tx_errors++; | 3365 | dev->stats.tx_errors++; |
3366 | 3366 | ||
@@ -3386,7 +3386,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
3386 | u32 bd_status; | 3386 | u32 bd_status; |
3387 | u8 txQ = 0; | 3387 | u8 txQ = 0; |
3388 | 3388 | ||
3389 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3389 | ugeth_vdbg("%s: IN", __func__); |
3390 | 3390 | ||
3391 | spin_lock_irq(&ugeth->lock); | 3391 | spin_lock_irq(&ugeth->lock); |
3392 | 3392 | ||
@@ -3459,7 +3459,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit | |||
3459 | u8 *bdBuffer; | 3459 | u8 *bdBuffer; |
3460 | struct net_device *dev; | 3460 | struct net_device *dev; |
3461 | 3461 | ||
3462 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3462 | ugeth_vdbg("%s: IN", __func__); |
3463 | 3463 | ||
3464 | dev = ugeth->dev; | 3464 | dev = ugeth->dev; |
3465 | 3465 | ||
@@ -3481,7 +3481,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit | |||
3481 | (bd_status & R_ERRORS_FATAL)) { | 3481 | (bd_status & R_ERRORS_FATAL)) { |
3482 | if (netif_msg_rx_err(ugeth)) | 3482 | if (netif_msg_rx_err(ugeth)) |
3483 | ugeth_err("%s, %d: ERROR!!! skb - 0x%08x", | 3483 | ugeth_err("%s, %d: ERROR!!! skb - 0x%08x", |
3484 | __FUNCTION__, __LINE__, (u32) skb); | 3484 | __func__, __LINE__, (u32) skb); |
3485 | if (skb) | 3485 | if (skb) |
3486 | dev_kfree_skb_any(skb); | 3486 | dev_kfree_skb_any(skb); |
3487 | 3487 | ||
@@ -3507,7 +3507,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit | |||
3507 | skb = get_new_skb(ugeth, bd); | 3507 | skb = get_new_skb(ugeth, bd); |
3508 | if (!skb) { | 3508 | if (!skb) { |
3509 | if (netif_msg_rx_err(ugeth)) | 3509 | if (netif_msg_rx_err(ugeth)) |
3510 | ugeth_warn("%s: No Rx Data Buffer", __FUNCTION__); | 3510 | ugeth_warn("%s: No Rx Data Buffer", __func__); |
3511 | dev->stats.rx_dropped++; | 3511 | dev->stats.rx_dropped++; |
3512 | break; | 3512 | break; |
3513 | } | 3513 | } |
@@ -3613,7 +3613,7 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info) | |||
3613 | register u32 tx_mask; | 3613 | register u32 tx_mask; |
3614 | u8 i; | 3614 | u8 i; |
3615 | 3615 | ||
3616 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3616 | ugeth_vdbg("%s: IN", __func__); |
3617 | 3617 | ||
3618 | uccf = ugeth->uccf; | 3618 | uccf = ugeth->uccf; |
3619 | ug_info = ugeth->ug_info; | 3619 | ug_info = ugeth->ug_info; |
@@ -3683,13 +3683,13 @@ static int ucc_geth_open(struct net_device *dev) | |||
3683 | struct ucc_geth_private *ugeth = netdev_priv(dev); | 3683 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
3684 | int err; | 3684 | int err; |
3685 | 3685 | ||
3686 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3686 | ugeth_vdbg("%s: IN", __func__); |
3687 | 3687 | ||
3688 | /* Test station address */ | 3688 | /* Test station address */ |
3689 | if (dev->dev_addr[0] & ENET_GROUP_ADDR) { | 3689 | if (dev->dev_addr[0] & ENET_GROUP_ADDR) { |
3690 | if (netif_msg_ifup(ugeth)) | 3690 | if (netif_msg_ifup(ugeth)) |
3691 | ugeth_err("%s: Multicast address used for station address" | 3691 | ugeth_err("%s: Multicast address used for station address" |
3692 | " - is this what you wanted?", __FUNCTION__); | 3692 | " - is this what you wanted?", __func__); |
3693 | return -EINVAL; | 3693 | return -EINVAL; |
3694 | } | 3694 | } |
3695 | 3695 | ||
@@ -3772,7 +3772,7 @@ static int ucc_geth_close(struct net_device *dev) | |||
3772 | { | 3772 | { |
3773 | struct ucc_geth_private *ugeth = netdev_priv(dev); | 3773 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
3774 | 3774 | ||
3775 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3775 | ugeth_vdbg("%s: IN", __func__); |
3776 | 3776 | ||
3777 | napi_disable(&ugeth->napi); | 3777 | napi_disable(&ugeth->napi); |
3778 | 3778 | ||
@@ -3840,7 +3840,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3840 | PHY_INTERFACE_MODE_TBI, PHY_INTERFACE_MODE_RTBI, | 3840 | PHY_INTERFACE_MODE_TBI, PHY_INTERFACE_MODE_RTBI, |
3841 | }; | 3841 | }; |
3842 | 3842 | ||
3843 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3843 | ugeth_vdbg("%s: IN", __func__); |
3844 | 3844 | ||
3845 | prop = of_get_property(np, "cell-index", NULL); | 3845 | prop = of_get_property(np, "cell-index", NULL); |
3846 | if (!prop) { | 3846 | if (!prop) { |
@@ -3857,7 +3857,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3857 | if (ug_info == NULL) { | 3857 | if (ug_info == NULL) { |
3858 | if (netif_msg_probe(&debug)) | 3858 | if (netif_msg_probe(&debug)) |
3859 | ugeth_err("%s: [%d] Missing additional data!", | 3859 | ugeth_err("%s: [%d] Missing additional data!", |
3860 | __FUNCTION__, ucc_num); | 3860 | __func__, ucc_num); |
3861 | return -ENODEV; | 3861 | return -ENODEV; |
3862 | } | 3862 | } |
3863 | 3863 | ||