Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

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)
         enet_addr_cont = kmalloc(sizeof(struct enet_addr_container), GFP_KERNEL);
         if (!enet_addr_cont) {
                 ugeth_err("%s: No memory for enet_addr_container object.",
-                          __FUNCTION__);
+                          __func__);
                 return NULL;
         }
 
@@ -427,7 +427,7 @@ static int hw_add_addr_in_paddr(struct ucc_geth_private *ugeth,
         struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
 
         if (!(paddr_num < NUM_OF_PADDRS)) {
-                ugeth_warn("%s: Illegal paddr_num.", __FUNCTION__);
+                ugeth_warn("%s: Illegal paddr_num.", __func__);
                 return -EINVAL;
         }
 
@@ -447,7 +447,7 @@ static int hw_clear_addr_in_paddr(struct ucc_geth_private *ugeth, u8 paddr_num)
         struct ucc_geth_82xx_address_filtering_pram __iomem *p_82xx_addr_filt;
 
         if (!(paddr_num < NUM_OF_PADDRS)) {
-                ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__);
+                ugeth_warn("%s: Illagel paddr_num.", __func__);
                 return -EINVAL;
         }
 
@@ -1441,7 +1441,7 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
         u32 upsmr, maccfg2, tbiBaseAddress;
         u16 value;
 
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        ugeth_vdbg("%s: IN", __func__);
 
         ug_info = ugeth->ug_info;
         ug_regs = ugeth->ug_regs;
@@ -1504,7 +1504,7 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
         if (ret_val != 0) {
                 if (netif_msg_probe(ugeth))
                         ugeth_err("%s: Preamble length must be between 3 and 7 inclusive.",
-                             __FUNCTION__);
+                             __func__);
                 return ret_val;
         }
 
@@ -1744,7 +1744,7 @@ static int ugeth_enable(struct ucc_geth_private *ugeth, enum comm_dir mode)
         /* check if the UCC number is in range. */
         if (ugeth->ug_info->uf_info.ucc_num >= UCC_MAX_NUM) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: ucc_num out of range.", __FUNCTION__);
+                        ugeth_err("%s: ucc_num out of range.", __func__);
                 return -EINVAL;
         }
 
@@ -1773,7 +1773,7 @@ static int ugeth_disable(struct ucc_geth_private * ugeth, enum comm_dir mode)
         /* check if the UCC number is in range. */
         if (ugeth->ug_info->uf_info.ucc_num >= UCC_MAX_NUM) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: ucc_num out of range.", __FUNCTION__);
+                        ugeth_err("%s: ucc_num out of range.", __func__);
                 return -EINVAL;
         }
 
@@ -2062,7 +2062,7 @@ static int ugeth_82xx_filtering_add_addr_in_paddr(struct ucc_geth_private *ugeth
                 ugeth_warn
                     ("%s: multicast address added to paddr will have no "
                      "effect - is this what you wanted?",
-                     __FUNCTION__);
+                     __func__);
 
         ugeth->indAddrRegUsed[paddr_num] = 1;   /* mark this paddr as used */
         /* store address in our database */
@@ -2278,7 +2278,7 @@ static void ucc_geth_stop(struct ucc_geth_private *ugeth)
         struct phy_device *phydev = ugeth->phydev;
         u32 tempval;
 
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        ugeth_vdbg("%s: IN", __func__);
 
         /* Disable the controller */
         ugeth_disable(ugeth, COMM_DIR_RX_AND_TX);
@@ -2315,7 +2315,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
               (uf_info->bd_mem_part == MEM_PART_MURAM))) {
                 if (netif_msg_probe(ugeth))
                         ugeth_err("%s: Bad memory partition value.",
-                                        __FUNCTION__);
+                                        __func__);
                 return -EINVAL;
         }
 
@@ -2327,7 +2327,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
                         if (netif_msg_probe(ugeth))
                                 ugeth_err
                                     ("%s: Rx BD ring length must be multiple of 4, no smaller than 8.",
-                                        __FUNCTION__);
+                                        __func__);
                         return -EINVAL;
                 }
         }
@@ -2338,7 +2338,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
                         if (netif_msg_probe(ugeth))
                                 ugeth_err
                                     ("%s: Tx BD ring length must be no smaller than 2.",
-                                     __FUNCTION__);
+                                     __func__);
                         return -EINVAL;
                 }
         }
@@ -2349,21 +2349,21 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
                 if (netif_msg_probe(ugeth))
                         ugeth_err
                             ("%s: max_rx_buf_length must be non-zero multiple of 128.",
-                             __FUNCTION__);
+                             __func__);
                 return -EINVAL;
         }
 
         /* num Tx queues */
         if (ug_info->numQueuesTx > NUM_TX_QUEUES) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: number of tx queues too large.", __FUNCTION__);
+                        ugeth_err("%s: number of tx queues too large.", __func__);
                 return -EINVAL;
         }
 
         /* num Rx queues */
         if (ug_info->numQueuesRx > NUM_RX_QUEUES) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: number of rx queues too large.", __FUNCTION__);
+                        ugeth_err("%s: number of rx queues too large.", __func__);
                 return -EINVAL;
         }
 
@@ -2374,7 +2374,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
                                 ugeth_err
                                     ("%s: VLAN priority table entry must not be"
                                         " larger than number of Rx queues.",
-                                     __FUNCTION__);
+                                     __func__);
                         return -EINVAL;
                 }
         }
@@ -2386,7 +2386,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
                                 ugeth_err
                                     ("%s: IP priority table entry must not be"
                                         " larger than number of Rx queues.",
-                                     __FUNCTION__);
+                                     __func__);
                         return -EINVAL;
                 }
         }
@@ -2394,7 +2394,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         if (ug_info->cam && !ug_info->ecamptr) {
                 if (netif_msg_probe(ugeth))
                         ugeth_err("%s: If cam mode is chosen, must supply cam ptr.",
-                                  __FUNCTION__);
+                                  __func__);
                 return -EINVAL;
         }
 
@@ -2404,7 +2404,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
                 if (netif_msg_probe(ugeth))
                         ugeth_err("%s: Number of station addresses greater than 1 "
                                   "not allowed in extended parsing mode.",
-                                  __FUNCTION__);
+                                  __func__);
                 return -EINVAL;
         }
 
@@ -2418,7 +2418,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         /* Initialize the general fast UCC block. */
         if (ucc_fast_init(uf_info, &ugeth->uccf)) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: Failed to init uccf.", __FUNCTION__);
+                        ugeth_err("%s: Failed to init uccf.", __func__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
@@ -2448,7 +2448,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         u8 __iomem *endOfRing;
         u8 numThreadsRxNumerical, numThreadsTxNumerical;
 
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        ugeth_vdbg("%s: IN", __func__);
         uccf = ugeth->uccf;
         ug_info = ugeth->ug_info;
         uf_info = &ug_info->uf_info;
@@ -2474,7 +2474,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         default:
                 if (netif_msg_ifup(ugeth))
                         ugeth_err("%s: Bad number of Rx threads value.",
-                                        __FUNCTION__);
+                                        __func__);
                 ucc_geth_memclean(ugeth);
                 return -EINVAL;
                 break;
@@ -2499,7 +2499,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         default:
                 if (netif_msg_ifup(ugeth))
                         ugeth_err("%s: Bad number of Tx threads value.",
-                                        __FUNCTION__);
+                                        __func__);
                 ucc_geth_memclean(ugeth);
                 return -EINVAL;
                 break;
@@ -2553,7 +2553,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         if (ret_val != 0) {
                 if (netif_msg_ifup(ugeth))
                         ugeth_err("%s: IPGIFG initialization parameter too large.",
-                                  __FUNCTION__);
+                                  __func__);
                 ucc_geth_memclean(ugeth);
                 return ret_val;
         }
@@ -2571,7 +2571,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         if (ret_val != 0) {
                 if (netif_msg_ifup(ugeth))
                         ugeth_err("%s: Half Duplex initialization parameter too large.",
-                          __FUNCTION__);
+                          __func__);
                 ucc_geth_memclean(ugeth);
                 return ret_val;
         }
@@ -2626,7 +2626,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                         if (netif_msg_ifup(ugeth))
                                 ugeth_err
                                     ("%s: Can not allocate memory for Tx bd rings.",
-                                     __FUNCTION__);
+                                     __func__);
                         ucc_geth_memclean(ugeth);
                         return -ENOMEM;
                 }
@@ -2662,7 +2662,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                         if (netif_msg_ifup(ugeth))
                                 ugeth_err
                                     ("%s: Can not allocate memory for Rx bd rings.",
-                                     __FUNCTION__);
+                                     __func__);
                         ucc_geth_memclean(ugeth);
                         return -ENOMEM;
                 }
@@ -2678,7 +2678,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (ugeth->tx_skbuff[j] == NULL) {
                         if (netif_msg_ifup(ugeth))
                                 ugeth_err("%s: Could not allocate tx_skbuff",
-                                          __FUNCTION__);
+                                          __func__);
                         ucc_geth_memclean(ugeth);
                         return -ENOMEM;
                 }
@@ -2710,7 +2710,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (ugeth->rx_skbuff[j] == NULL) {
                         if (netif_msg_ifup(ugeth))
                                 ugeth_err("%s: Could not allocate rx_skbuff",
-                                          __FUNCTION__);
+                                          __func__);
                         ucc_geth_memclean(ugeth);
                         return -ENOMEM;
                 }
@@ -2744,7 +2744,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         ugeth_err
                             ("%s: Can not allocate DPRAM memory for p_tx_glbl_pram.",
-                             __FUNCTION__);
+                             __func__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
@@ -2767,7 +2767,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         ugeth_err
                             ("%s: Can not allocate DPRAM memory for p_thread_data_tx.",
-                             __FUNCTION__);
+                             __func__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
@@ -2797,7 +2797,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         ugeth_err
                             ("%s: Can not allocate DPRAM memory for p_send_q_mem_reg.",
-                             __FUNCTION__);
+                             __func__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
@@ -2841,7 +2841,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                         if (netif_msg_ifup(ugeth))
                                 ugeth_err
                                  ("%s: Can not allocate DPRAM memory for p_scheduler.",
-                                     __FUNCTION__);
+                                     __func__);
                         ucc_geth_memclean(ugeth);
                         return -ENOMEM;
                 }
@@ -2892,7 +2892,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                                 ugeth_err
                                     ("%s: Can not allocate DPRAM memory for"
                                         " p_tx_fw_statistics_pram.",
-                                        __FUNCTION__);
+                                        __func__);
                         ucc_geth_memclean(ugeth);
                         return -ENOMEM;
                 }
@@ -2932,7 +2932,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         ugeth_err
                             ("%s: Can not allocate DPRAM memory for p_rx_glbl_pram.",
-                             __FUNCTION__);
+                             __func__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
@@ -2954,7 +2954,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         ugeth_err
                             ("%s: Can not allocate DPRAM memory for p_thread_data_rx.",
-                             __FUNCTION__);
+                             __func__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
@@ -2978,7 +2978,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                         if (netif_msg_ifup(ugeth))
                                 ugeth_err
                                         ("%s: Can not allocate DPRAM memory for"
-                                        " p_rx_fw_statistics_pram.", __FUNCTION__);
+                                        " p_rx_fw_statistics_pram.", __func__);
                         ucc_geth_memclean(ugeth);
                         return -ENOMEM;
                 }
@@ -3001,7 +3001,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         ugeth_err
                             ("%s: Can not allocate DPRAM memory for"
-                                " p_rx_irq_coalescing_tbl.", __FUNCTION__);
+                                " p_rx_irq_coalescing_tbl.", __func__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
@@ -3070,7 +3070,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         ugeth_err
                             ("%s: Can not allocate DPRAM memory for p_rx_bd_qs_tbl.",
-                             __FUNCTION__);
+                             __func__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
@@ -3147,7 +3147,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (!ug_info->extendedFilteringChainPointer) {
                         if (netif_msg_ifup(ugeth))
                                 ugeth_err("%s: Null Extended Filtering Chain Pointer.",
-                                          __FUNCTION__);
+                                          __func__);
                         ucc_geth_memclean(ugeth);
                         return -EINVAL;
                 }
@@ -3161,7 +3161,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                         if (netif_msg_ifup(ugeth))
                                 ugeth_err
                                         ("%s: Can not allocate DPRAM memory for"
-                                        " p_exf_glbl_param.", __FUNCTION__);
+                                        " p_exf_glbl_param.", __func__);
                         ucc_geth_memclean(ugeth);
                         return -ENOMEM;
                 }
@@ -3209,7 +3209,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         ugeth_err
                             ("%s: Can not allocate memory for"
-                                " p_UccInitEnetParamShadows.", __FUNCTION__);
+                                " p_UccInitEnetParamShadows.", __func__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
@@ -3244,7 +3244,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_16_BYTES)) {
                 if (netif_msg_ifup(ugeth))
                         ugeth_err("%s: Invalid largest External Lookup Key Size.",
-                                  __FUNCTION__);
+                                  __func__);
                 ucc_geth_memclean(ugeth);
                 return -EINVAL;
         }
@@ -3271,7 +3271,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 ug_info->riscRx, 1)) != 0) {
                 if (netif_msg_ifup(ugeth))
                                 ugeth_err("%s: Can not fill p_init_enet_param_shadow.",
-                                        __FUNCTION__);
+                                        __func__);
                 ucc_geth_memclean(ugeth);
                 return ret_val;
         }
@@ -3287,7 +3287,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                                     ug_info->riscTx, 0)) != 0) {
                 if (netif_msg_ifup(ugeth))
                         ugeth_err("%s: Can not fill p_init_enet_param_shadow.",
-                                  __FUNCTION__);
+                                  __func__);
                 ucc_geth_memclean(ugeth);
                 return ret_val;
         }
@@ -3297,7 +3297,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if ((ret_val = rx_bd_buffer_set(ugeth, (u8) i)) != 0) {
                         if (netif_msg_ifup(ugeth))
                                 ugeth_err("%s: Can not fill Rx bds with buffers.",
-                                          __FUNCTION__);
+                                          __func__);
                         ucc_geth_memclean(ugeth);
                         return ret_val;
                 }
@@ -3309,7 +3309,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         ugeth_err
                             ("%s: Can not allocate DPRAM memory for p_init_enet_pram.",
-                             __FUNCTION__);
+                             __func__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
@@ -3360,7 +3360,7 @@ static void ucc_geth_timeout(struct net_device *dev)
 {
         struct ucc_geth_private *ugeth = netdev_priv(dev);
 
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        ugeth_vdbg("%s: IN", __func__);
 
         dev->stats.tx_errors++;
 
@@ -3386,7 +3386,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
         u32 bd_status;
         u8 txQ = 0;
 
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        ugeth_vdbg("%s: IN", __func__);
 
         spin_lock_irq(&ugeth->lock);
 
@@ -3459,7 +3459,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
         u8 *bdBuffer;
         struct net_device *dev;
 
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        ugeth_vdbg("%s: IN", __func__);
 
         dev = ugeth->dev;
 
@@ -3481,7 +3481,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
                     (bd_status & R_ERRORS_FATAL)) {
                         if (netif_msg_rx_err(ugeth))
                                 ugeth_err("%s, %d: ERROR!!! skb - 0x%08x",
-                                           __FUNCTION__, __LINE__, (u32) skb);
+                                           __func__, __LINE__, (u32) skb);
                         if (skb)
                                 dev_kfree_skb_any(skb);
 
@@ -3507,7 +3507,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
                 skb = get_new_skb(ugeth, bd);
                 if (!skb) {
                         if (netif_msg_rx_err(ugeth))
-                                ugeth_warn("%s: No Rx Data Buffer", __FUNCTION__);
+                                ugeth_warn("%s: No Rx Data Buffer", __func__);
                         dev->stats.rx_dropped++;
                         break;
                 }
@@ -3613,7 +3613,7 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
         register u32 tx_mask;
         u8 i;
 
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        ugeth_vdbg("%s: IN", __func__);
 
         uccf = ugeth->uccf;
         ug_info = ugeth->ug_info;
@@ -3683,13 +3683,13 @@ static int ucc_geth_open(struct net_device *dev)
         struct ucc_geth_private *ugeth = netdev_priv(dev);
         int err;
 
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        ugeth_vdbg("%s: IN", __func__);
 
         /* Test station address */
         if (dev->dev_addr[0] & ENET_GROUP_ADDR) {
                 if (netif_msg_ifup(ugeth))
                         ugeth_err("%s: Multicast address used for station address"
-                                  " - is this what you wanted?", __FUNCTION__);
+                                  " - is this what you wanted?", __func__);
                 return -EINVAL;
         }
 
@@ -3772,7 +3772,7 @@ static int ucc_geth_close(struct net_device *dev)
 {
         struct ucc_geth_private *ugeth = netdev_priv(dev);
 
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        ugeth_vdbg("%s: IN", __func__);
 
         napi_disable(&ugeth->napi);
 
@@ -3840,7 +3840,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 PHY_INTERFACE_MODE_TBI, PHY_INTERFACE_MODE_RTBI,
         };
 
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        ugeth_vdbg("%s: IN", __func__);
 
         prop = of_get_property(np, "cell-index", NULL);
         if (!prop) {
@@ -3857,7 +3857,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         if (ug_info == NULL) {
                 if (netif_msg_probe(&debug))
                         ugeth_err("%s: [%d] Missing additional data!",
-                                        __FUNCTION__, ucc_num);
+                                        __func__, ucc_num);
                 return -ENODEV;
         }