drivers/net: replace __FUNCTION__ with __func__

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 28 insertions, 28 deletions

diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index aa0bf6e1c69..e1b441effbb 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -110,7 +110,7 @@ spi_read_buf(struct enc28j60_net *priv, int len, u8 *data)
         }
         if (ret && netif_msg_drv(priv))
                 printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",
-                        __FUNCTION__, ret);
+                        __func__, ret);
 
         return ret;
 }
@@ -131,7 +131,7 @@ static int spi_write_buf(struct enc28j60_net *priv, int len,
                 ret = spi_write(priv->spi, priv->spi_transfer_buf, len + 1);
                 if (ret && netif_msg_drv(priv))
                         printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",
-                                __FUNCTION__, ret);
+                                __func__, ret);
         }
         return ret;
 }
@@ -156,7 +156,7 @@ static u8 spi_read_op(struct enc28j60_net *priv, u8 op,
         ret = spi_write_then_read(priv->spi, tx_buf, 1, rx_buf, slen);
         if (ret)
                 printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",
-                        __FUNCTION__, ret);
+                        __func__, ret);
         else
                 val = rx_buf[slen - 1];
 
@@ -176,14 +176,14 @@ static int spi_write_op(struct enc28j60_net *priv, u8 op,
         ret = spi_write(priv->spi, priv->spi_transfer_buf, 2);
         if (ret && netif_msg_drv(priv))
                 printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",
-                        __FUNCTION__, ret);
+                        __func__, ret);
         return ret;
 }
 
 static void enc28j60_soft_reset(struct enc28j60_net *priv)
 {
         if (netif_msg_hw(priv))
-                printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);
+                printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
 
         spi_write_op(priv, ENC28J60_SOFT_RESET, 0, ENC28J60_SOFT_RESET);
         /* Errata workaround #1, CLKRDY check is unreliable,
@@ -357,7 +357,7 @@ static void enc28j60_mem_read(struct enc28j60_net *priv,
                 reg = nolock_regw_read(priv, ERDPTL);
                 if (reg != addr)
                         printk(KERN_DEBUG DRV_NAME ": %s() error writing ERDPT "
-                                "(0x%04x - 0x%04x)\n", __FUNCTION__, reg, addr);
+                                "(0x%04x - 0x%04x)\n", __func__, reg, addr);
         }
 #endif
         spi_read_buf(priv, len, data);
@@ -380,7 +380,7 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)
                 if (reg != TXSTART_INIT)
                         printk(KERN_DEBUG DRV_NAME
                                 ": %s() ERWPT:0x%04x != 0x%04x\n",
-                                __FUNCTION__, reg, TXSTART_INIT);
+                                __func__, reg, TXSTART_INIT);
         }
 #endif
         /* Set the TXND pointer to correspond to the packet size given */
@@ -390,13 +390,13 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)
         if (netif_msg_hw(priv))
                 printk(KERN_DEBUG DRV_NAME
                         ": %s() after control byte ERWPT:0x%04x\n",
-                        __FUNCTION__, nolock_regw_read(priv, EWRPTL));
+                        __func__, nolock_regw_read(priv, EWRPTL));
         /* copy the packet into the transmit buffer */
         spi_write_buf(priv, len, data);
         if (netif_msg_hw(priv))
                 printk(KERN_DEBUG DRV_NAME
                          ": %s() after write packet ERWPT:0x%04x, len=%d\n",
-                         __FUNCTION__, nolock_regw_read(priv, EWRPTL), len);
+                         __func__, nolock_regw_read(priv, EWRPTL), len);
         mutex_unlock(&priv->lock);
 }
 
@@ -495,7 +495,7 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev)
                 if (netif_msg_drv(priv))
                         printk(KERN_DEBUG DRV_NAME
                                 ": %s() Hardware must be disabled to set "
-                                "Mac address\n", __FUNCTION__);
+                                "Mac address\n", __func__);
                 ret = -EBUSY;
         }
         mutex_unlock(&priv->lock);
@@ -575,7 +575,7 @@ static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end)
         if (start > 0x1FFF || end > 0x1FFF || start > end) {
                 if (netif_msg_drv(priv))
                         printk(KERN_ERR DRV_NAME ": %s(%d, %d) RXFIFO "
-                                "bad parameters!\n", __FUNCTION__, start, end);
+                                "bad parameters!\n", __func__, start, end);
                 return;
         }
         /* set receive buffer start + end */
@@ -591,7 +591,7 @@ static void nolock_txfifo_init(struct enc28j60_net *priv, u16 start, u16 end)
         if (start > 0x1FFF || end > 0x1FFF || start > end) {
                 if (netif_msg_drv(priv))
                         printk(KERN_ERR DRV_NAME ": %s(%d, %d) TXFIFO "
-                                "bad parameters!\n", __FUNCTION__, start, end);
+                                "bad parameters!\n", __func__, start, end);
                 return;
         }
         /* set transmit buffer start + end */
@@ -630,7 +630,7 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)
         u8 reg;
 
         if (netif_msg_drv(priv))
-                printk(KERN_DEBUG DRV_NAME ": %s() - %s\n", __FUNCTION__,
+                printk(KERN_DEBUG DRV_NAME ": %s() - %s\n", __func__,
                         priv->full_duplex ? "FullDuplex" : "HalfDuplex");
 
         mutex_lock(&priv->lock);
@@ -661,7 +661,7 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)
         if (reg == 0x00 || reg == 0xff) {
                 if (netif_msg_drv(priv))
                         printk(KERN_DEBUG DRV_NAME ": %s() Invalid RevId %d\n",
-                                __FUNCTION__, reg);
+                                __func__, reg);
                 return 0;
         }
 
@@ -724,7 +724,7 @@ static void enc28j60_hw_enable(struct enc28j60_net *priv)
         /* enable interrupts */
         if (netif_msg_hw(priv))
                 printk(KERN_DEBUG DRV_NAME ": %s() enabling interrupts.\n",
-                        __FUNCTION__);
+                        __func__);
 
         enc28j60_phy_write(priv, PHIE, PHIE_PGEIE | PHIE_PLNKIE);
 
@@ -888,7 +888,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                 if (netif_msg_rx_err(priv))
                         dev_err(&ndev->dev,
                                 "%s() Invalid packet address!! 0x%04x\n",
-                                __FUNCTION__, priv->next_pk_ptr);
+                                __func__, priv->next_pk_ptr);
                 /* packet address corrupted: reset RX logic */
                 mutex_lock(&priv->lock);
                 nolock_reg_bfclr(priv, ECON1, ECON1_RXEN);
@@ -917,7 +917,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
         rxstat |= rsv[4];
 
         if (netif_msg_rx_status(priv))
-                enc28j60_dump_rsv(priv, __FUNCTION__, next_packet, len, rxstat);
+                enc28j60_dump_rsv(priv, __func__, next_packet, len, rxstat);
 
         if (!RSV_GETBIT(rxstat, RSV_RXOK)) {
                 if (netif_msg_rx_err(priv))
@@ -941,7 +941,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                         enc28j60_mem_read(priv, priv->next_pk_ptr + sizeof(rsv),
                                         len, skb_put(skb, len));
                         if (netif_msg_pktdata(priv))
-                                dump_packet(__FUNCTION__, skb->len, skb->data);
+                                dump_packet(__func__, skb->len, skb->data);
                         skb->protocol = eth_type_trans(skb, ndev);
                         /* update statistics */
                         ndev->stats.rx_packets++;
@@ -958,7 +958,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
         erxrdpt = erxrdpt_workaround(next_packet, RXSTART_INIT, RXEND_INIT);
         if (netif_msg_hw(priv))
                 printk(KERN_DEBUG DRV_NAME ": %s() ERXRDPT:0x%04x\n",
-                        __FUNCTION__, erxrdpt);
+                        __func__, erxrdpt);
 
         mutex_lock(&priv->lock);
         nolock_regw_write(priv, ERXRDPTL, erxrdpt);
@@ -968,7 +968,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                 reg = nolock_regw_read(priv, ERXRDPTL);
                 if (reg != erxrdpt)
                         printk(KERN_DEBUG DRV_NAME ": %s() ERXRDPT verify "
-                                "error (0x%04x - 0x%04x)\n", __FUNCTION__,
+                                "error (0x%04x - 0x%04x)\n", __func__,
                                 reg, erxrdpt);
         }
 #endif
@@ -1006,7 +1006,7 @@ static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv)
         mutex_unlock(&priv->lock);
         if (netif_msg_rx_status(priv))
                 printk(KERN_DEBUG DRV_NAME ": %s() free_space = %d\n",
-                        __FUNCTION__, free_space);
+                        __func__, free_space);
         return free_space;
 }
 
@@ -1022,7 +1022,7 @@ static void enc28j60_check_link_status(struct net_device *ndev)
         reg = enc28j60_phy_read(priv, PHSTAT2);
         if (netif_msg_hw(priv))
                 printk(KERN_DEBUG DRV_NAME ": %s() PHSTAT1: %04x, "
-                        "PHSTAT2: %04x\n", __FUNCTION__,
+                        "PHSTAT2: %04x\n", __func__,
                         enc28j60_phy_read(priv, PHSTAT1), reg);
         duplex = reg & PHSTAT2_DPXSTAT;
 
@@ -1095,7 +1095,7 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
         int intflags, loop;
 
         if (netif_msg_intr(priv))
-                printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);
+                printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
         /* disable further interrupts */
         locked_reg_bfclr(priv, EIE, EIE_INTIE);
 
@@ -1198,7 +1198,7 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
         /* re-enable interrupts */
         locked_reg_bfset(priv, EIE, EIE_INTIE);
         if (netif_msg_intr(priv))
-                printk(KERN_DEBUG DRV_NAME ": %s() exit\n", __FUNCTION__);
+                printk(KERN_DEBUG DRV_NAME ": %s() exit\n", __func__);
 }
 
 /*
@@ -1213,7 +1213,7 @@ static void enc28j60_hw_tx(struct enc28j60_net *priv)
                         ": Tx Packet Len:%d\n", priv->tx_skb->len);
 
         if (netif_msg_pktdata(priv))
-                dump_packet(__FUNCTION__,
+                dump_packet(__func__,
                             priv->tx_skb->len, priv->tx_skb->data);
         enc28j60_packet_write(priv, priv->tx_skb->len, priv->tx_skb->data);
 
@@ -1254,7 +1254,7 @@ static int enc28j60_send_packet(struct sk_buff *skb, struct net_device *dev)
         struct enc28j60_net *priv = netdev_priv(dev);
 
         if (netif_msg_tx_queued(priv))
-                printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);
+                printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
 
         /* If some error occurs while trying to transmit this
          * packet, you should return '1' from this function.
@@ -1325,7 +1325,7 @@ static int enc28j60_net_open(struct net_device *dev)
         struct enc28j60_net *priv = netdev_priv(dev);
 
         if (netif_msg_drv(priv))
-                printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);
+                printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
 
         if (!is_valid_ether_addr(dev->dev_addr)) {
                 if (netif_msg_ifup(priv)) {
@@ -1363,7 +1363,7 @@ static int enc28j60_net_close(struct net_device *dev)
         struct enc28j60_net *priv = netdev_priv(dev);
 
         if (netif_msg_drv(priv))
-                printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);
+                printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
 
         enc28j60_hw_disable(priv);
         enc28j60_lowpower(priv, true);