Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 978,
    "url": "http://patchwork.ozlabs.org/api/patches/978/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/200809222152.m8MLqECj031955@imap1.linux-foundation.org/",
    "project": {
        "id": 7,
        "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api",
        "name": "Linux network development",
        "link_name": "netdev",
        "list_id": "netdev.vger.kernel.org",
        "list_email": "netdev@vger.kernel.org",
        "web_url": null,
        "scm_url": null,
        "webscm_url": null,
        "list_archive_url": "",
        "list_archive_url_format": "",
        "commit_url_format": ""
    },
    "msgid": "<200809222152.m8MLqECj031955@imap1.linux-foundation.org>",
    "list_archive_url": null,
    "date": "2008-09-22T21:52:14",
    "name": "[07/21] drivers/net: replace __FUNCTION__ with __func__",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "4d621b4852b1ca8fc02e1c7d5c19c1bc0fc0a875",
    "submitter": {
        "id": 107,
        "url": "http://patchwork.ozlabs.org/api/people/107/?format=api",
        "name": "Andrew Morton",
        "email": "akpm@linux-foundation.org"
    },
    "delegate": {
        "id": 36,
        "url": "http://patchwork.ozlabs.org/api/users/36/?format=api",
        "username": "jgarzik",
        "first_name": "Jeff",
        "last_name": "Garzik",
        "email": "jgarzik@pobox.com"
    },
    "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/200809222152.m8MLqECj031955@imap1.linux-foundation.org/mbox/",
    "series": [],
    "comments": "http://patchwork.ozlabs.org/api/patches/978/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/978/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<netdev-owner@vger.kernel.org>",
        "X-Original-To": "patchwork-incoming@ozlabs.org",
        "Delivered-To": "patchwork-incoming@ozlabs.org",
        "Received": [
            "from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id 197C6DDE21\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 23 Sep 2008 07:59:04 +1000 (EST)",
            "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754095AbYIVV65 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tMon, 22 Sep 2008 17:58:57 -0400",
            "(majordomo@vger.kernel.org) by vger.kernel.org id S1754093AbYIVV64\n\t(ORCPT <rfc822; netdev-outgoing>); Mon, 22 Sep 2008 17:58:56 -0400",
            "from smtp1.linux-foundation.org ([140.211.169.13]:53845 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1754080AbYIVV6x (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Mon, 22 Sep 2008 17:58:53 -0400",
            "from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLrDOH018507\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:57:34 -0700",
            "from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLqECj031955; Mon, 22 Sep 2008 14:52:14 -0700"
        ],
        "Message-Id": "<200809222152.m8MLqECj031955@imap1.linux-foundation.org>",
        "Subject": "[patch 07/21] drivers/net: replace __FUNCTION__ with __func__",
        "To": "jeff@garzik.org",
        "Cc": "netdev@vger.kernel.org, akpm@linux-foundation.org,\n\tharvey.harrison@gmail.com",
        "From": "akpm@linux-foundation.org",
        "Date": "Mon, 22 Sep 2008 14:52:14 -0700",
        "X-Spam-Status": "No, hits=-3.359 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED",
        "X-Spam-Checker-Version": "SpamAssassin 3.2.4-osdl_revision__1.47__",
        "X-MIMEDefang-Filter": "lf$Revision: 1.188 $",
        "X-Scanned-By": "MIMEDefang 2.63 on 140.211.169.13",
        "Sender": "netdev-owner@vger.kernel.org",
        "Precedence": "bulk",
        "List-ID": "<netdev.vger.kernel.org>",
        "X-Mailing-List": "netdev@vger.kernel.org"
    },
    "content": "From: Harvey Harrison <harvey.harrison@gmail.com>\n\n__FUNCTION__ is gcc-specific, use __func__\n\nSigned-off-by: Harvey Harrison <harvey.harrison@gmail.com>\nCc: Jeff Garzik <jeff@garzik.org>\nSigned-off-by: Andrew Morton <akpm@linux-foundation.org>\n---\n\n drivers/net/3c505.c               |    4 \n drivers/net/arcnet/arcnet.c       |   18 ++--\n drivers/net/arcnet/com20020.c     |   16 +--\n drivers/net/ax88796.c             |   14 +--\n drivers/net/bfin_mac.c            |    8 -\n drivers/net/bonding/bonding.h     |    2 \n drivers/net/cxgb3/cxgb3_offload.c |    8 -\n drivers/net/e100.c                |    2 \n drivers/net/enc28j60.c            |   56 ++++++-------\n drivers/net/ibm_newemac/phy.c     |    2 \n drivers/net/ixgb/ixgb.h           |    2 \n drivers/net/ixgbe/ixgbe.h         |    2 \n drivers/net/meth.c                |    2 \n drivers/net/mipsnet.c             |    2 \n drivers/net/netx-eth.c            |    2 \n drivers/net/netxen/netxen_nic.h   |    2 \n drivers/net/pci-skeleton.c        |    4 \n drivers/net/r8169.c               |    2 \n drivers/net/s2io.c                |   40 ++++-----\n drivers/net/smc911x.c             |   66 +++++++--------\n drivers/net/smc91x.c              |   40 ++++-----\n drivers/net/tehuti.h              |    8 -\n drivers/net/tsi108_eth.c          |    6 -\n drivers/net/ucc_geth.c            |  116 ++++++++++++++--------------\n drivers/net/usb/mcs7830.c         |    2 \n drivers/net/usb/pegasus.c         |   24 ++---\n drivers/net/via-velocity.h        |    2 \n drivers/net/wan/cycx_drv.c        |    6 -\n drivers/net/wan/cycx_x25.c        |   12 +-\n drivers/net/wan/dscc4.c           |    2 \n drivers/net/wan/pc300_tty.c       |    2 \n 31 files changed, 237 insertions(+), 237 deletions(-)",
    "diff": "diff -puN drivers/net/3c505.c~drivers-net-replace-__function__-with-__func__ drivers/net/3c505.c\n--- a/drivers/net/3c505.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/3c505.c\n@@ -130,12 +130,12 @@ static const char filename[] = __FILE__;\n \n static const char timeout_msg[] = \"*** timeout at %s:%s (line %d) ***\\n\";\n #define TIMEOUT_MSG(lineno) \\\n-\tprintk(timeout_msg, filename,__FUNCTION__,(lineno))\n+\tprintk(timeout_msg, filename,__func__,(lineno))\n \n static const char invalid_pcb_msg[] =\n \"*** invalid pcb length %d at %s:%s (line %d) ***\\n\";\n #define INVALID_PCB_MSG(len) \\\n-\tprintk(invalid_pcb_msg, (len),filename,__FUNCTION__,__LINE__)\n+\tprintk(invalid_pcb_msg, (len),filename,__func__,__LINE__)\n \n static char search_msg[] __initdata = KERN_INFO \"%s: Looking for 3c505 adapter at address %#x...\";\n \ndiff -puN drivers/net/arcnet/arcnet.c~drivers-net-replace-__function__-with-__func__ drivers/net/arcnet/arcnet.c\n--- a/drivers/net/arcnet/arcnet.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/arcnet/arcnet.c\n@@ -442,24 +442,24 @@ static int arcnet_open(struct net_device\n \t\tBUGMSG(D_NORMAL, \"WARNING!  Station address FF may confuse \"\n \t\t       \"DOS networking programs!\\n\");\n \n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \tif (ASTATUS() & RESETflag) {\n-\t  \tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\t  \tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \t\tACOMMAND(CFLAGScmd | RESETclear);\n \t}\n \n \n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \t/* make sure we're ready to receive IRQ's. */\n \tAINTMASK(0);\n \tudelay(1);\t\t/* give it time to set the mask before\n \t\t\t\t * we reset it again. (may not even be\n \t\t\t\t * necessary)\n \t\t\t\t */\n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \tlp->intmask = NORXflag | RECONflag;\n \tAINTMASK(lp->intmask);\n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \n \tnetif_start_queue(dev);\n \n@@ -670,14 +670,14 @@ static int arcnet_send_packet(struct sk_\n \t\tfreeskb = 0;\n \t}\n \n-\tBUGMSG(D_DEBUG, \"%s: %d: %s, status: %x\\n\",__FILE__,__LINE__,__FUNCTION__,ASTATUS());\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s, status: %x\\n\",__FILE__,__LINE__,__func__,ASTATUS());\n \t/* make sure we didn't ignore a TX IRQ while we were in here */\n \tAINTMASK(0);\n \n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \tlp->intmask |= TXFREEflag|EXCNAKflag;\n \tAINTMASK(lp->intmask);\n-\tBUGMSG(D_DEBUG, \"%s: %d: %s, status: %x\\n\",__FILE__,__LINE__,__FUNCTION__,ASTATUS());\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s, status: %x\\n\",__FILE__,__LINE__,__func__,ASTATUS());\n \n \tspin_unlock_irqrestore(&lp->lock, flags);\n \tif (freeskb) {\n@@ -798,7 +798,7 @@ irqreturn_t arcnet_interrupt(int irq, vo\n                 diagstatus = (status >> 8) & 0xFF;\n \n \t\tBUGMSG(D_DEBUG, \"%s: %d: %s: status=%x\\n\",\n-\t\t\t__FILE__,__LINE__,__FUNCTION__,status);\n+\t\t\t__FILE__,__LINE__,__func__,status);\n \t\tdidsomething = 0;\n \n \t\t/*\ndiff -puN drivers/net/arcnet/com20020.c~drivers-net-replace-__function__-with-__func__ drivers/net/arcnet/com20020.c\n--- a/drivers/net/arcnet/com20020.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/arcnet/com20020.c\n@@ -238,15 +238,15 @@ static int com20020_reset(struct net_dev\n \tu_char inbyte;\n \n \tBUGMSG(D_DEBUG, \"%s: %d: %s: dev: %p, lp: %p, dev->name: %s\\n\",\n-\t\t__FILE__,__LINE__,__FUNCTION__,dev,lp,dev->name);\n+\t\t__FILE__,__LINE__,__func__,dev,lp,dev->name);\n \tBUGMSG(D_INIT, \"Resetting %s (status=%02Xh)\\n\",\n \t       dev->name, ASTATUS());\n \n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \tlp->config = TXENcfg | (lp->timeout << 3) | (lp->backplane << 2);\n \t/* power-up defaults */\n \tSETCONF;\n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \n \tif (really_reset) {\n \t\t/* reset the card */\n@@ -254,22 +254,22 @@ static int com20020_reset(struct net_dev\n \t\tmdelay(RESETtime * 2);\t/* COM20020 seems to be slower sometimes */\n \t}\n \t/* clear flags & end reset */\n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \tACOMMAND(CFLAGScmd | RESETclear | CONFIGclear);\n \n \t/* verify that the ARCnet signature byte is present */\n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \n \tcom20020_copy_from_card(dev, 0, 0, &inbyte, 1);\n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \tif (inbyte != TESTvalue) {\n-\t\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\t\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \t\tBUGMSG(D_NORMAL, \"reset failed: TESTvalue not present.\\n\");\n \t\treturn 1;\n \t}\n \t/* enable extended (512-byte) packets */\n \tACOMMAND(CONFIGcmd | EXTconf);\n-\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__FUNCTION__);\n+\tBUGMSG(D_DEBUG, \"%s: %d: %s\\n\",__FILE__,__LINE__,__func__);\n \n \t/* done!  return success. */\n \treturn 0;\ndiff -puN drivers/net/ax88796.c~drivers-net-replace-__function__-with-__func__ drivers/net/ax88796.c\n--- a/drivers/net/ax88796.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/ax88796.c\n@@ -153,7 +153,7 @@ static void ax_reset_8390(struct net_dev\n \twhile ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) {\n \t\tif (jiffies - reset_start_time > 2*HZ/100) {\n \t\t\tdev_warn(&ax->dev->dev, \"%s: %s did not complete.\\n\",\n-\t\t\t       __FUNCTION__, dev->name);\n+\t\t\t       __func__, dev->name);\n \t\t\tbreak;\n \t\t}\n \t}\n@@ -173,7 +173,7 @@ static void ax_get_8390_hdr(struct net_d\n \tif (ei_status.dmaing) {\n \t\tdev_err(&ax->dev->dev, \"%s: DMAing conflict in %s \"\n \t\t\t\"[DMAstat:%d][irqlock:%d].\\n\",\n-\t\t\tdev->name, __FUNCTION__,\n+\t\t\tdev->name, __func__,\n \t\t\tei_status.dmaing, ei_status.irqlock);\n \t\treturn;\n \t}\n@@ -215,7 +215,7 @@ static void ax_block_input(struct net_de\n \t\tdev_err(&ax->dev->dev,\n \t\t\t\"%s: DMAing conflict in %s \"\n \t\t\t\"[DMAstat:%d][irqlock:%d].\\n\",\n-\t\t\tdev->name, __FUNCTION__,\n+\t\t\tdev->name, __func__,\n \t\t\tei_status.dmaing, ei_status.irqlock);\n \t\treturn;\n \t}\n@@ -260,7 +260,7 @@ static void ax_block_output(struct net_d\n \tif (ei_status.dmaing) {\n \t\tdev_err(&ax->dev->dev, \"%s: DMAing conflict in %s.\"\n \t\t\t\"[DMAstat:%d][irqlock:%d]\\n\",\n-\t\t\tdev->name, __FUNCTION__,\n+\t\t\tdev->name, __func__,\n \t\t       ei_status.dmaing, ei_status.irqlock);\n \t\treturn;\n \t}\n@@ -396,7 +396,7 @@ ax_phy_issueaddr(struct net_device *dev,\n {\n \tif (phy_debug)\n \t\tpr_debug(\"%s: dev %p, %04x, %04x, %d\\n\",\n-\t\t\t__FUNCTION__, dev, phy_addr, reg, opc);\n+\t\t\t__func__, dev, phy_addr, reg, opc);\n \n \tax_mii_ei_outbits(dev, 0x3f, 6);\t/* pre-amble */\n \tax_mii_ei_outbits(dev, 1, 2);\t\t/* frame-start */\n@@ -422,7 +422,7 @@ ax_phy_read(struct net_device *dev, int \n       \tspin_unlock_irqrestore(&ei_local->page_lock, flags);\n \n \tif (phy_debug)\n-\t\tpr_debug(\"%s: %04x.%04x => read %04x\\n\", __FUNCTION__,\n+\t\tpr_debug(\"%s: %04x.%04x => read %04x\\n\", __func__,\n \t\t\t phy_addr, reg, result);\n \n \treturn result;\n@@ -436,7 +436,7 @@ ax_phy_write(struct net_device *dev, int\n \tunsigned long flags;\n \n \tdev_dbg(&ax->dev->dev, \"%s: %p, %04x, %04x %04x\\n\",\n-\t\t__FUNCTION__, dev, phy_addr, reg, value);\n+\t\t__func__, dev, phy_addr, reg, value);\n \n       \tspin_lock_irqsave(&ei->page_lock, flags);\n \ndiff -puN drivers/net/bfin_mac.c~drivers-net-replace-__function__-with-__func__ drivers/net/bfin_mac.c\n--- a/drivers/net/bfin_mac.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/bfin_mac.c\n@@ -811,7 +811,7 @@ static void bfin_mac_enable(void)\n {\n \tu32 opmode;\n \n-\tpr_debug(\"%s: %s\\n\", DRV_NAME, __FUNCTION__);\n+\tpr_debug(\"%s: %s\\n\", DRV_NAME, __func__);\n \n \t/* Set RX DMA */\n \tbfin_write_DMA1_NEXT_DESC_PTR(&(rx_list_head->desc_a));\n@@ -847,7 +847,7 @@ static void bfin_mac_enable(void)\n /* Our watchdog timed out. Called by the networking layer */\n static void bfin_mac_timeout(struct net_device *dev)\n {\n-\tpr_debug(\"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tpr_debug(\"%s: %s\\n\", dev->name, __func__);\n \n \tbfin_mac_disable();\n \n@@ -949,7 +949,7 @@ static int bfin_mac_open(struct net_devi\n {\n \tstruct bfin_mac_local *lp = netdev_priv(dev);\n \tint retval;\n-\tpr_debug(\"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tpr_debug(\"%s: %s\\n\", dev->name, __func__);\n \n \t/*\n \t * Check that the address is valid.  If its not, refuse\n@@ -989,7 +989,7 @@ static int bfin_mac_open(struct net_devi\n static int bfin_mac_close(struct net_device *dev)\n {\n \tstruct bfin_mac_local *lp = netdev_priv(dev);\n-\tpr_debug(\"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tpr_debug(\"%s: %s\\n\", dev->name, __func__);\n \n \tnetif_stop_queue(dev);\n \tnetif_carrier_off(dev);\ndiff -puN drivers/net/bonding/bonding.h~drivers-net-replace-__function__-with-__func__ drivers/net/bonding/bonding.h\n--- a/drivers/net/bonding/bonding.h~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/bonding/bonding.h\n@@ -32,7 +32,7 @@\n #ifdef BONDING_DEBUG\n #define dprintk(fmt, args...) \\\n \tprintk(KERN_DEBUG     \\\n-\t       DRV_NAME \": %s() %d: \" fmt, __FUNCTION__, __LINE__ , ## args )\n+\t       DRV_NAME \": %s() %d: \" fmt, __func__, __LINE__ , ## args )\n #else\n #define dprintk(fmt, args...)\n #endif /* BONDING_DEBUG */\ndiff -puN drivers/net/cxgb3/cxgb3_offload.c~drivers-net-replace-__function__-with-__func__ drivers/net/cxgb3/cxgb3_offload.c\n--- a/drivers/net/cxgb3/cxgb3_offload.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/cxgb3/cxgb3_offload.c\n@@ -1018,7 +1018,7 @@ static void set_l2t_ix(struct t3cdev *td\n \n \tskb = alloc_skb(sizeof(*req), GFP_ATOMIC);\n \tif (!skb) {\n-\t\tprintk(KERN_ERR \"%s: cannot allocate skb!\\n\", __FUNCTION__);\n+\t\tprintk(KERN_ERR \"%s: cannot allocate skb!\\n\", __func__);\n \t\treturn;\n \t}\n \tskb->priority = CPL_PRIORITY_CONTROL;\n@@ -1049,14 +1049,14 @@ void cxgb_redirect(struct dst_entry *old\n \t\treturn;\n \tif (!is_offloading(newdev)) {\n \t\tprintk(KERN_WARNING \"%s: Redirect to non-offload \"\n-\t\t       \"device ignored.\\n\", __FUNCTION__);\n+\t\t       \"device ignored.\\n\", __func__);\n \t\treturn;\n \t}\n \ttdev = dev2t3cdev(olddev);\n \tBUG_ON(!tdev);\n \tif (tdev != dev2t3cdev(newdev)) {\n \t\tprintk(KERN_WARNING \"%s: Redirect to different \"\n-\t\t       \"offload device ignored.\\n\", __FUNCTION__);\n+\t\t       \"offload device ignored.\\n\", __func__);\n \t\treturn;\n \t}\n \n@@ -1064,7 +1064,7 @@ void cxgb_redirect(struct dst_entry *old\n \te = t3_l2t_get(tdev, new->neighbour, newdev);\n \tif (!e) {\n \t\tprintk(KERN_ERR \"%s: couldn't allocate new l2t entry!\\n\",\n-\t\t       __FUNCTION__);\n+\t\t       __func__);\n \t\treturn;\n \t}\n \ndiff -puN drivers/net/e100.c~drivers-net-replace-__function__-with-__func__ drivers/net/e100.c\n--- a/drivers/net/e100.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/e100.c\n@@ -195,7 +195,7 @@ MODULE_PARM_DESC(use_io, \"Force use of i\n #define DPRINTK(nlevel, klevel, fmt, args...) \\\n \t(void)((NETIF_MSG_##nlevel & nic->msg_enable) && \\\n \tprintk(KERN_##klevel PFX \"%s: %s: \" fmt, nic->netdev->name, \\\n-\t\t__FUNCTION__ , ## args))\n+\t\t__func__ , ## args))\n \n #define INTEL_8255X_ETHERNET_DEVICE(device_id, ich) {\\\n \tPCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \\\ndiff -puN drivers/net/enc28j60.c~drivers-net-replace-__function__-with-__func__ drivers/net/enc28j60.c\n--- a/drivers/net/enc28j60.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/enc28j60.c\n@@ -110,7 +110,7 @@ spi_read_buf(struct enc28j60_net *priv, \n \t}\n \tif (ret && netif_msg_drv(priv))\n \t\tprintk(KERN_DEBUG DRV_NAME \": %s() failed: ret = %d\\n\",\n-\t\t\t__FUNCTION__, ret);\n+\t\t\t__func__, ret);\n \n \treturn ret;\n }\n@@ -131,7 +131,7 @@ static int spi_write_buf(struct enc28j60\n \t\tret = spi_write(priv->spi, priv->spi_transfer_buf, len + 1);\n \t\tif (ret && netif_msg_drv(priv))\n \t\t\tprintk(KERN_DEBUG DRV_NAME \": %s() failed: ret = %d\\n\",\n-\t\t\t\t__FUNCTION__, ret);\n+\t\t\t\t__func__, ret);\n \t}\n \treturn ret;\n }\n@@ -156,7 +156,7 @@ static u8 spi_read_op(struct enc28j60_ne\n \tret = spi_write_then_read(priv->spi, tx_buf, 1, rx_buf, slen);\n \tif (ret)\n \t\tprintk(KERN_DEBUG DRV_NAME \": %s() failed: ret = %d\\n\",\n-\t\t\t__FUNCTION__, ret);\n+\t\t\t__func__, ret);\n \telse\n \t\tval = rx_buf[slen - 1];\n \n@@ -176,14 +176,14 @@ static int spi_write_op(struct enc28j60_\n \tret = spi_write(priv->spi, priv->spi_transfer_buf, 2);\n \tif (ret && netif_msg_drv(priv))\n \t\tprintk(KERN_DEBUG DRV_NAME \": %s() failed: ret = %d\\n\",\n-\t\t\t__FUNCTION__, ret);\n+\t\t\t__func__, ret);\n \treturn ret;\n }\n \n static void enc28j60_soft_reset(struct enc28j60_net *priv)\n {\n \tif (netif_msg_hw(priv))\n-\t\tprintk(KERN_DEBUG DRV_NAME \": %s() enter\\n\", __FUNCTION__);\n+\t\tprintk(KERN_DEBUG DRV_NAME \": %s() enter\\n\", __func__);\n \n \tspi_write_op(priv, ENC28J60_SOFT_RESET, 0, ENC28J60_SOFT_RESET);\n \t/* Errata workaround #1, CLKRDY check is unreliable,\n@@ -357,7 +357,7 @@ static void enc28j60_mem_read(struct enc\n \t\treg = nolock_regw_read(priv, ERDPTL);\n \t\tif (reg != addr)\n \t\t\tprintk(KERN_DEBUG DRV_NAME \": %s() error writing ERDPT \"\n-\t\t\t\t\"(0x%04x - 0x%04x)\\n\", __FUNCTION__, reg, addr);\n+\t\t\t\t\"(0x%04x - 0x%04x)\\n\", __func__, reg, addr);\n \t}\n #endif\n \tspi_read_buf(priv, len, data);\n@@ -380,7 +380,7 @@ enc28j60_packet_write(struct enc28j60_ne\n \t\tif (reg != TXSTART_INIT)\n \t\t\tprintk(KERN_DEBUG DRV_NAME\n \t\t\t\t\": %s() ERWPT:0x%04x != 0x%04x\\n\",\n-\t\t\t\t__FUNCTION__, reg, TXSTART_INIT);\n+\t\t\t\t__func__, reg, TXSTART_INIT);\n \t}\n #endif\n \t/* Set the TXND pointer to correspond to the packet size given */\n@@ -390,13 +390,13 @@ enc28j60_packet_write(struct enc28j60_ne\n \tif (netif_msg_hw(priv))\n \t\tprintk(KERN_DEBUG DRV_NAME\n \t\t\t\": %s() after control byte ERWPT:0x%04x\\n\",\n-\t\t\t__FUNCTION__, nolock_regw_read(priv, EWRPTL));\n+\t\t\t__func__, nolock_regw_read(priv, EWRPTL));\n \t/* copy the packet into the transmit buffer */\n \tspi_write_buf(priv, len, data);\n \tif (netif_msg_hw(priv))\n \t\tprintk(KERN_DEBUG DRV_NAME\n \t\t\t \": %s() after write packet ERWPT:0x%04x, len=%d\\n\",\n-\t\t\t __FUNCTION__, nolock_regw_read(priv, EWRPTL), len);\n+\t\t\t __func__, nolock_regw_read(priv, EWRPTL), len);\n \tmutex_unlock(&priv->lock);\n }\n \n@@ -495,7 +495,7 @@ static int enc28j60_set_hw_macaddr(struc\n \t\tif (netif_msg_drv(priv))\n \t\t\tprintk(KERN_DEBUG DRV_NAME\n \t\t\t\t\": %s() Hardware must be disabled to set \"\n-\t\t\t\t\"Mac address\\n\", __FUNCTION__);\n+\t\t\t\t\"Mac address\\n\", __func__);\n \t\tret = -EBUSY;\n \t}\n \tmutex_unlock(&priv->lock);\n@@ -575,7 +575,7 @@ static void nolock_rxfifo_init(struct en\n \tif (start > 0x1FFF || end > 0x1FFF || start > end) {\n \t\tif (netif_msg_drv(priv))\n \t\t\tprintk(KERN_ERR DRV_NAME \": %s(%d, %d) RXFIFO \"\n-\t\t\t\t\"bad parameters!\\n\", __FUNCTION__, start, end);\n+\t\t\t\t\"bad parameters!\\n\", __func__, start, end);\n \t\treturn;\n \t}\n \t/* set receive buffer start + end */\n@@ -591,7 +591,7 @@ static void nolock_txfifo_init(struct en\n \tif (start > 0x1FFF || end > 0x1FFF || start > end) {\n \t\tif (netif_msg_drv(priv))\n \t\t\tprintk(KERN_ERR DRV_NAME \": %s(%d, %d) TXFIFO \"\n-\t\t\t\t\"bad parameters!\\n\", __FUNCTION__, start, end);\n+\t\t\t\t\"bad parameters!\\n\", __func__, start, end);\n \t\treturn;\n \t}\n \t/* set transmit buffer start + end */\n@@ -630,7 +630,7 @@ static int enc28j60_hw_init(struct enc28\n \tu8 reg;\n \n \tif (netif_msg_drv(priv))\n-\t\tprintk(KERN_DEBUG DRV_NAME \": %s() - %s\\n\", __FUNCTION__,\n+\t\tprintk(KERN_DEBUG DRV_NAME \": %s() - %s\\n\", __func__,\n \t\t\tpriv->full_duplex ? \"FullDuplex\" : \"HalfDuplex\");\n \n \tmutex_lock(&priv->lock);\n@@ -661,7 +661,7 @@ static int enc28j60_hw_init(struct enc28\n \tif (reg == 0x00 || reg == 0xff) {\n \t\tif (netif_msg_drv(priv))\n \t\t\tprintk(KERN_DEBUG DRV_NAME \": %s() Invalid RevId %d\\n\",\n-\t\t\t\t__FUNCTION__, reg);\n+\t\t\t\t__func__, reg);\n \t\treturn 0;\n \t}\n \n@@ -724,7 +724,7 @@ static void enc28j60_hw_enable(struct en\n \t/* enable interrupts */\n \tif (netif_msg_hw(priv))\n \t\tprintk(KERN_DEBUG DRV_NAME \": %s() enabling interrupts.\\n\",\n-\t\t\t__FUNCTION__);\n+\t\t\t__func__);\n \n \tenc28j60_phy_write(priv, PHIE, PHIE_PGEIE | PHIE_PLNKIE);\n \n@@ -888,7 +888,7 @@ static void enc28j60_hw_rx(struct net_de\n \t\tif (netif_msg_rx_err(priv))\n \t\t\tdev_err(&ndev->dev,\n \t\t\t\t\"%s() Invalid packet address!! 0x%04x\\n\",\n-\t\t\t\t__FUNCTION__, priv->next_pk_ptr);\n+\t\t\t\t__func__, priv->next_pk_ptr);\n \t\t/* packet address corrupted: reset RX logic */\n \t\tmutex_lock(&priv->lock);\n \t\tnolock_reg_bfclr(priv, ECON1, ECON1_RXEN);\n@@ -917,7 +917,7 @@ static void enc28j60_hw_rx(struct net_de\n \trxstat |= rsv[4];\n \n \tif (netif_msg_rx_status(priv))\n-\t\tenc28j60_dump_rsv(priv, __FUNCTION__, next_packet, len, rxstat);\n+\t\tenc28j60_dump_rsv(priv, __func__, next_packet, len, rxstat);\n \n \tif (!RSV_GETBIT(rxstat, RSV_RXOK)) {\n \t\tif (netif_msg_rx_err(priv))\n@@ -941,7 +941,7 @@ static void enc28j60_hw_rx(struct net_de\n \t\t\tenc28j60_mem_read(priv, priv->next_pk_ptr + sizeof(rsv),\n \t\t\t\t\tlen, skb_put(skb, len));\n \t\t\tif (netif_msg_pktdata(priv))\n-\t\t\t\tdump_packet(__FUNCTION__, skb->len, skb->data);\n+\t\t\t\tdump_packet(__func__, skb->len, skb->data);\n \t\t\tskb->protocol = eth_type_trans(skb, ndev);\n \t\t\t/* update statistics */\n \t\t\tndev->stats.rx_packets++;\n@@ -958,7 +958,7 @@ static void enc28j60_hw_rx(struct net_de\n \terxrdpt = erxrdpt_workaround(next_packet, RXSTART_INIT, RXEND_INIT);\n \tif (netif_msg_hw(priv))\n \t\tprintk(KERN_DEBUG DRV_NAME \": %s() ERXRDPT:0x%04x\\n\",\n-\t\t\t__FUNCTION__, erxrdpt);\n+\t\t\t__func__, erxrdpt);\n \n \tmutex_lock(&priv->lock);\n \tnolock_regw_write(priv, ERXRDPTL, erxrdpt);\n@@ -968,7 +968,7 @@ static void enc28j60_hw_rx(struct net_de\n \t\treg = nolock_regw_read(priv, ERXRDPTL);\n \t\tif (reg != erxrdpt)\n \t\t\tprintk(KERN_DEBUG DRV_NAME \": %s() ERXRDPT verify \"\n-\t\t\t\t\"error (0x%04x - 0x%04x)\\n\", __FUNCTION__,\n+\t\t\t\t\"error (0x%04x - 0x%04x)\\n\", __func__,\n \t\t\t\treg, erxrdpt);\n \t}\n #endif\n@@ -1006,7 +1006,7 @@ static int enc28j60_get_free_rxfifo(stru\n \tmutex_unlock(&priv->lock);\n \tif (netif_msg_rx_status(priv))\n \t\tprintk(KERN_DEBUG DRV_NAME \": %s() free_space = %d\\n\",\n-\t\t\t__FUNCTION__, free_space);\n+\t\t\t__func__, free_space);\n \treturn free_space;\n }\n \n@@ -1022,7 +1022,7 @@ static void enc28j60_check_link_status(s\n \treg = enc28j60_phy_read(priv, PHSTAT2);\n \tif (netif_msg_hw(priv))\n \t\tprintk(KERN_DEBUG DRV_NAME \": %s() PHSTAT1: %04x, \"\n-\t\t\t\"PHSTAT2: %04x\\n\", __FUNCTION__,\n+\t\t\t\"PHSTAT2: %04x\\n\", __func__,\n \t\t\tenc28j60_phy_read(priv, PHSTAT1), reg);\n \tduplex = reg & PHSTAT2_DPXSTAT;\n \n@@ -1095,7 +1095,7 @@ static void enc28j60_irq_work_handler(st\n \tint intflags, loop;\n \n \tif (netif_msg_intr(priv))\n-\t\tprintk(KERN_DEBUG DRV_NAME \": %s() enter\\n\", __FUNCTION__);\n+\t\tprintk(KERN_DEBUG DRV_NAME \": %s() enter\\n\", __func__);\n \t/* disable further interrupts */\n \tlocked_reg_bfclr(priv, EIE, EIE_INTIE);\n \n@@ -1198,7 +1198,7 @@ static void enc28j60_irq_work_handler(st\n \t/* re-enable interrupts */\n \tlocked_reg_bfset(priv, EIE, EIE_INTIE);\n \tif (netif_msg_intr(priv))\n-\t\tprintk(KERN_DEBUG DRV_NAME \": %s() exit\\n\", __FUNCTION__);\n+\t\tprintk(KERN_DEBUG DRV_NAME \": %s() exit\\n\", __func__);\n }\n \n /*\n@@ -1213,7 +1213,7 @@ static void enc28j60_hw_tx(struct enc28j\n \t\t\t\": Tx Packet Len:%d\\n\", priv->tx_skb->len);\n \n \tif (netif_msg_pktdata(priv))\n-\t\tdump_packet(__FUNCTION__,\n+\t\tdump_packet(__func__,\n \t\t\t    priv->tx_skb->len, priv->tx_skb->data);\n \tenc28j60_packet_write(priv, priv->tx_skb->len, priv->tx_skb->data);\n \n@@ -1254,7 +1254,7 @@ static int enc28j60_send_packet(struct s\n \tstruct enc28j60_net *priv = netdev_priv(dev);\n \n \tif (netif_msg_tx_queued(priv))\n-\t\tprintk(KERN_DEBUG DRV_NAME \": %s() enter\\n\", __FUNCTION__);\n+\t\tprintk(KERN_DEBUG DRV_NAME \": %s() enter\\n\", __func__);\n \n \t/* If some error occurs while trying to transmit this\n \t * packet, you should return '1' from this function.\n@@ -1325,7 +1325,7 @@ static int enc28j60_net_open(struct net_\n \tstruct enc28j60_net *priv = netdev_priv(dev);\n \n \tif (netif_msg_drv(priv))\n-\t\tprintk(KERN_DEBUG DRV_NAME \": %s() enter\\n\", __FUNCTION__);\n+\t\tprintk(KERN_DEBUG DRV_NAME \": %s() enter\\n\", __func__);\n \n \tif (!is_valid_ether_addr(dev->dev_addr)) {\n \t\tif (netif_msg_ifup(priv)) {\n@@ -1363,7 +1363,7 @@ static int enc28j60_net_close(struct net\n \tstruct enc28j60_net *priv = netdev_priv(dev);\n \n \tif (netif_msg_drv(priv))\n-\t\tprintk(KERN_DEBUG DRV_NAME \": %s() enter\\n\", __FUNCTION__);\n+\t\tprintk(KERN_DEBUG DRV_NAME \": %s() enter\\n\", __func__);\n \n \tenc28j60_hw_disable(priv);\n \tenc28j60_lowpower(priv, true);\ndiff -puN drivers/net/ibm_newemac/phy.c~drivers-net-replace-__function__-with-__func__ drivers/net/ibm_newemac/phy.c\n--- a/drivers/net/ibm_newemac/phy.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/ibm_newemac/phy.c\n@@ -321,7 +321,7 @@ static struct mii_phy_def bcm5248_phy_de\n \n static int m88e1111_init(struct mii_phy *phy)\n {\n-\tpr_debug(\"%s: Marvell 88E1111 Ethernet\\n\", __FUNCTION__);\n+\tpr_debug(\"%s: Marvell 88E1111 Ethernet\\n\", __func__);\n \tphy_write(phy, 0x14, 0x0ce3);\n \tphy_write(phy, 0x18, 0x4101);\n \tphy_write(phy, 0x09, 0x0e00);\ndiff -puN drivers/net/ixgb/ixgb.h~drivers-net-replace-__function__-with-__func__ drivers/net/ixgb/ixgb.h\n--- a/drivers/net/ixgb/ixgb.h~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/ixgb/ixgb.h\n@@ -85,7 +85,7 @@ struct ixgb_adapter;\n #define DPRINTK(nlevel, klevel, fmt, args...) \\\n \t(void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \\\n \tprintk(KERN_##klevel PFX \"%s: %s: \" fmt, adapter->netdev->name, \\\n-\t\t__FUNCTION__ , ## args))\n+\t\t__func__ , ## args))\n \n \n /* TX/RX descriptor defines */\ndiff -puN drivers/net/ixgbe/ixgbe.h~drivers-net-replace-__function__-with-__func__ drivers/net/ixgbe/ixgbe.h\n--- a/drivers/net/ixgbe/ixgbe.h~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/ixgbe/ixgbe.h\n@@ -47,7 +47,7 @@\n #define DPRINTK(nlevel, klevel, fmt, args...) \\\n \t((void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \\\n \tprintk(KERN_##klevel PFX \"%s: %s: \" fmt, adapter->netdev->name, \\\n-\t\t__FUNCTION__ , ## args)))\n+\t\t__func__ , ## args)))\n \n /* TX/RX descriptor defines */\n #define IXGBE_DEFAULT_TXD\t\t   1024\ndiff -puN drivers/net/meth.c~drivers-net-replace-__function__-with-__func__ drivers/net/meth.c\n--- a/drivers/net/meth.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/meth.c\n@@ -41,7 +41,7 @@\n #endif\n \n #if MFE_DEBUG>=1\n-#define DPRINTK(str,args...) printk(KERN_DEBUG \"meth: %s: \" str, __FUNCTION__ , ## args)\n+#define DPRINTK(str,args...) printk(KERN_DEBUG \"meth: %s: \" str, __func__ , ## args)\n #define MFE_RX_DEBUG 2\n #else\n #define DPRINTK(str,args...)\ndiff -puN drivers/net/mipsnet.c~drivers-net-replace-__function__-with-__func__ drivers/net/mipsnet.c\n--- a/drivers/net/mipsnet.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/mipsnet.c\n@@ -203,7 +203,7 @@ static irqreturn_t mipsnet_interrupt(int\n \n out_badirq:\n \tprintk(KERN_INFO \"%s: %s(): irq %d for unknown device\\n\",\n-\t       dev->name, __FUNCTION__, irq);\n+\t       dev->name, __func__, irq);\n \treturn ret;\n }\n \ndiff -puN drivers/net/netx-eth.c~drivers-net-replace-__function__-with-__func__ drivers/net/netx-eth.c\n--- a/drivers/net/netx-eth.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/netx-eth.c\n@@ -189,7 +189,7 @@ netx_eth_interrupt(int irq, void *dev_id\n \n \t\tif ((status & ISR_CON_HI) || (status & ISR_IND_HI))\n \t\t\tprintk(\"%s: unexpected status: 0x%08x\\n\",\n-\t\t\t    __FUNCTION__, status);\n+\t\t\t    __func__, status);\n \n \t\tfill_level =\n \t\t    readl(NETX_PFIFO_FILL_LEVEL(IND_FIFO_PORT_LO(priv->id)));\ndiff -puN drivers/net/netxen/netxen_nic.h~drivers-net-replace-__function__-with-__func__ drivers/net/netxen/netxen_nic.h\n--- a/drivers/net/netxen/netxen_nic.h~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/netxen/netxen_nic.h\n@@ -742,7 +742,7 @@ extern char netxen_nic_driver_name[];\n \t} while (0)\n #else\n #define DPRINTK(klevel, fmt, args...)\tdo { \\\n-\tprintk(KERN_##klevel PFX \"%s: %s: \" fmt, __FUNCTION__,\\\n+\tprintk(KERN_##klevel PFX \"%s: %s: \" fmt, __func__,\\\n \t\t(adapter != NULL && adapter->netdev != NULL) ? \\\n \t\tadapter->netdev->name : NULL, \\\n \t\t## args); } while(0)\ndiff -puN drivers/net/pci-skeleton.c~drivers-net-replace-__function__-with-__func__ drivers/net/pci-skeleton.c\n--- a/drivers/net/pci-skeleton.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/pci-skeleton.c\n@@ -119,7 +119,7 @@ KERN_INFO \"  Support available from http\n \n #ifdef NETDRV_DEBUG\n /* note: prints function name for you */\n-#  define DPRINTK(fmt, args...) printk(KERN_DEBUG \"%s: \" fmt, __FUNCTION__ , ## args)\n+#  define DPRINTK(fmt, args...) printk(KERN_DEBUG \"%s: \" fmt, __func__ , ## args)\n #else\n #  define DPRINTK(fmt, args...)\n #endif\n@@ -130,7 +130,7 @@ KERN_INFO \"  Support available from http\n #  define assert(expr) \\\n         if(!(expr)) {\t\t\t\t\t\\\n         printk( \"Assertion failed! %s,%s,%s,line=%d\\n\",\t\\\n-        #expr,__FILE__,__FUNCTION__,__LINE__);\t\t\\\n+        #expr,__FILE__,__func__,__LINE__);\t\t\\\n         }\n #endif\n \ndiff -puN drivers/net/r8169.c~drivers-net-replace-__function__-with-__func__ drivers/net/r8169.c\n--- a/drivers/net/r8169.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/r8169.c\n@@ -36,7 +36,7 @@\n #define assert(expr) \\\n \tif (!(expr)) {\t\t\t\t\t\\\n \t\tprintk( \"Assertion failed! %s,%s,%s,line=%d\\n\",\t\\\n-\t\t#expr,__FILE__,__FUNCTION__,__LINE__);\t\t\\\n+\t\t#expr,__FILE__,__func__,__LINE__);\t\t\\\n \t}\n #define dprintk(fmt, args...) \\\n \tdo { printk(KERN_DEBUG PFX fmt, ## args); } while (0)\ndiff -puN drivers/net/s2io.c~drivers-net-replace-__function__-with-__func__ drivers/net/s2io.c\n--- a/drivers/net/s2io.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/s2io.c\n@@ -3136,7 +3136,7 @@ static void tx_intr_handler(struct fifo_\n \t\tif (skb == NULL) {\n \t\t\tspin_unlock_irqrestore(&fifo_data->tx_lock, flags);\n \t\t\tDBG_PRINT(ERR_DBG, \"%s: Null skb \",\n-\t\t\t__FUNCTION__);\n+\t\t\t__func__);\n \t\t\tDBG_PRINT(ERR_DBG, \"in Tx Free Intr\\n\");\n \t\t\treturn;\n \t\t}\n@@ -3496,7 +3496,7 @@ static void s2io_reset(struct s2io_nic *\n \tunsigned long long mem_alloc_cnt, mem_free_cnt, watchdog_cnt;\n \n \tDBG_PRINT(INIT_DBG,\"%s - Resetting XFrame card %s\\n\",\n-\t\t\t__FUNCTION__, sp->dev->name);\n+\t\t\t__func__, sp->dev->name);\n \n \t/* Back up  the PCI-X CMD reg, dont want to lose MMRBC, OST settings */\n \tpci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd));\n@@ -3518,7 +3518,7 @@ static void s2io_reset(struct s2io_nic *\n \t}\n \n \tif (check_pci_device_id(val16) == (u16)PCI_ANY_ID) {\n-\t\tDBG_PRINT(ERR_DBG,\"%s SW_Reset failed!\\n\", __FUNCTION__);\n+\t\tDBG_PRINT(ERR_DBG,\"%s SW_Reset failed!\\n\", __func__);\n \t}\n \n \tpci_write_config_word(sp->pdev, PCIX_COMMAND_REGISTER, pci_cmd);\n@@ -3768,7 +3768,7 @@ static void restore_xmsi_data(struct s2i\n \t\tval64 = (s2BIT(7) | s2BIT(15) | vBIT(msix_index, 26, 6));\n \t\twriteq(val64, &bar0->xmsi_access);\n \t\tif (wait_for_msix_trans(nic, msix_index)) {\n-\t\t\tDBG_PRINT(ERR_DBG, \"failed in %s\\n\", __FUNCTION__);\n+\t\t\tDBG_PRINT(ERR_DBG, \"failed in %s\\n\", __func__);\n \t\t\tcontinue;\n \t\t}\n \t}\n@@ -3789,7 +3789,7 @@ static void store_xmsi_data(struct s2io_\n \t\tval64 = (s2BIT(15) | vBIT(msix_index, 26, 6));\n \t\twriteq(val64, &bar0->xmsi_access);\n \t\tif (wait_for_msix_trans(nic, msix_index)) {\n-\t\t\tDBG_PRINT(ERR_DBG, \"failed in %s\\n\", __FUNCTION__);\n+\t\t\tDBG_PRINT(ERR_DBG, \"failed in %s\\n\", __func__);\n \t\t\tcontinue;\n \t\t}\n \t\taddr = readq(&bar0->xmsi_address);\n@@ -3812,7 +3812,7 @@ static int s2io_enable_msi_x(struct s2io\n \t\t\t       GFP_KERNEL);\n \tif (!nic->entries) {\n \t\tDBG_PRINT(INFO_DBG, \"%s: Memory allocation failed\\n\", \\\n-\t\t\t__FUNCTION__);\n+\t\t\t__func__);\n \t\tnic->mac_control.stats_info->sw_stat.mem_alloc_fail_cnt++;\n \t\treturn -ENOMEM;\n \t}\n@@ -3826,7 +3826,7 @@ static int s2io_enable_msi_x(struct s2io\n \t\t\t\t   GFP_KERNEL);\n \tif (!nic->s2io_entries) {\n \t\tDBG_PRINT(INFO_DBG, \"%s: Memory allocation failed\\n\",\n-\t\t\t__FUNCTION__);\n+\t\t\t__func__);\n \t\tnic->mac_control.stats_info->sw_stat.mem_alloc_fail_cnt++;\n \t\tkfree(nic->entries);\n \t\tnic->mac_control.stats_info->sw_stat.mem_freed\n@@ -6746,7 +6746,7 @@ static int s2io_change_mtu(struct net_de\n \t\tret = s2io_card_up(sp);\n \t\tif (ret) {\n \t\t\tDBG_PRINT(ERR_DBG, \"%s: Device bring up failed\\n\",\n-\t\t\t\t  __FUNCTION__);\n+\t\t\t\t  __func__);\n \t\t\treturn ret;\n \t\t}\n \t\ts2io_wake_all_tx_queue(sp);\n@@ -7530,7 +7530,7 @@ static int rx_osm_handler(struct ring_in\n \t\t\t\t\tdefault:\n \t\t\t\t\t\tDBG_PRINT(ERR_DBG,\n \t\t\t\t\t\t\t\"%s: Samadhana!!\\n\",\n-\t\t\t\t\t\t\t __FUNCTION__);\n+\t\t\t\t\t\t\t __func__);\n \t\t\t\t\t\tBUG();\n \t\t\t\t}\n \t\t\t}\n@@ -7781,7 +7781,7 @@ s2io_init_nic(struct pci_dev *pdev, cons\n \t\treturn -ENOMEM;\n \t}\n \tif ((ret = pci_request_regions(pdev, s2io_driver_name))) {\n-\t\tDBG_PRINT(ERR_DBG, \"%s: Request Regions failed - %x \\n\", __FUNCTION__, ret);\n+\t\tDBG_PRINT(ERR_DBG, \"%s: Request Regions failed - %x \\n\", __func__, ret);\n \t\tpci_disable_device(pdev);\n \t\treturn -ENODEV;\n \t}\n@@ -7998,7 +7998,7 @@ s2io_init_nic(struct pci_dev *pdev, cons\n \tif (sp->device_type & XFRAME_II_DEVICE) {\n \t\tmode = s2io_verify_pci_mode(sp);\n \t\tif (mode < 0) {\n-\t\t\tDBG_PRINT(ERR_DBG, \"%s: \", __FUNCTION__);\n+\t\t\tDBG_PRINT(ERR_DBG, \"%s: \", __func__);\n \t\t\tDBG_PRINT(ERR_DBG, \" Unsupported PCI bus mode\\n\");\n \t\t\tret = -EBADSLT;\n \t\t\tgoto set_swap_failed;\n@@ -8299,7 +8299,7 @@ static int check_L2_lro_capable(u8 *buff\n \n \tif (!(rxdp->Control_1 & RXD_FRAME_PROTO_TCP)) {\n \t\tDBG_PRINT(INIT_DBG,\"%s: Non-TCP frames not supported for LRO\\n\",\n-\t\t\t  __FUNCTION__);\n+\t\t\t  __func__);\n \t\treturn -1;\n \t}\n \n@@ -8330,7 +8330,7 @@ static int check_L2_lro_capable(u8 *buff\n static int check_for_socket_match(struct lro *lro, struct iphdr *ip,\n \t\t\t\t  struct tcphdr *tcp)\n {\n-\tDBG_PRINT(INFO_DBG,\"%s: Been here...\\n\", __FUNCTION__);\n+\tDBG_PRINT(INFO_DBG,\"%s: Been here...\\n\", __func__);\n \tif ((lro->iph->saddr != ip->saddr) || (lro->iph->daddr != ip->daddr) ||\n \t   (lro->tcph->source != tcp->source) || (lro->tcph->dest != tcp->dest))\n \t\treturn -1;\n@@ -8345,7 +8345,7 @@ static inline int get_l4_pyld_length(str\n static void initiate_new_session(struct lro *lro, u8 *l2h,\n \tstruct iphdr *ip, struct tcphdr *tcp, u32 tcp_pyld_len, u16 vlan_tag)\n {\n-\tDBG_PRINT(INFO_DBG,\"%s: Been here...\\n\", __FUNCTION__);\n+\tDBG_PRINT(INFO_DBG,\"%s: Been here...\\n\", __func__);\n \tlro->l2h = l2h;\n \tlro->iph = ip;\n \tlro->tcph = tcp;\n@@ -8375,7 +8375,7 @@ static void update_L3L4_header(struct s2\n \tstruct tcphdr *tcp = lro->tcph;\n \t__sum16 nchk;\n \tstruct stat_block *statinfo = sp->mac_control.stats_info;\n-\tDBG_PRINT(INFO_DBG,\"%s: Been here...\\n\", __FUNCTION__);\n+\tDBG_PRINT(INFO_DBG,\"%s: Been here...\\n\", __func__);\n \n \t/* Update L3 header */\n \tip->tot_len = htons(lro->total_len);\n@@ -8403,7 +8403,7 @@ static void update_L3L4_header(struct s2\n static void aggregate_new_rx(struct lro *lro, struct iphdr *ip,\n \t\tstruct tcphdr *tcp, u32 l4_pyld)\n {\n-\tDBG_PRINT(INFO_DBG,\"%s: Been here...\\n\", __FUNCTION__);\n+\tDBG_PRINT(INFO_DBG,\"%s: Been here...\\n\", __func__);\n \tlro->total_len += l4_pyld;\n \tlro->frags_len += l4_pyld;\n \tlro->tcp_next_seq += l4_pyld;\n@@ -8427,7 +8427,7 @@ static int verify_l3_l4_lro_capable(stru\n {\n \tu8 *ptr;\n \n-\tDBG_PRINT(INFO_DBG,\"%s: Been here...\\n\", __FUNCTION__);\n+\tDBG_PRINT(INFO_DBG,\"%s: Been here...\\n\", __func__);\n \n \tif (!tcp_pyld_len) {\n \t\t/* Runt frame or a pure ack */\n@@ -8509,7 +8509,7 @@ s2io_club_tcp_session(struct ring_info *\n \n \t\t\tif ((*lro)->tcp_next_seq != ntohl(tcph->seq)) {\n \t\t\t\tDBG_PRINT(INFO_DBG, \"%s:Out of order. expected \"\n-\t\t\t\t\t  \"0x%x, actual 0x%x\\n\", __FUNCTION__,\n+\t\t\t\t\t  \"0x%x, actual 0x%x\\n\", __func__,\n \t\t\t\t\t  (*lro)->tcp_next_seq,\n \t\t\t\t\t  ntohl(tcph->seq));\n \n@@ -8549,7 +8549,7 @@ s2io_club_tcp_session(struct ring_info *\n \n \tif (ret == 0) { /* sessions exceeded */\n \t\tDBG_PRINT(INFO_DBG,\"%s:All LRO sessions already in use\\n\",\n-\t\t\t  __FUNCTION__);\n+\t\t\t  __func__);\n \t\t*lro = NULL;\n \t\treturn ret;\n \t}\n@@ -8571,7 +8571,7 @@ s2io_club_tcp_session(struct ring_info *\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tDBG_PRINT(ERR_DBG,\"%s:Dont know, can't say!!\\n\",\n-\t\t\t\t__FUNCTION__);\n+\t\t\t\t__func__);\n \t\t\tbreak;\n \t}\n \ndiff -puN drivers/net/smc911x.c~drivers-net-replace-__function__-with-__func__ drivers/net/smc911x.c\n--- a/drivers/net/smc911x.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/smc911x.c\n@@ -183,7 +183,7 @@ static void smc911x_reset(struct net_dev\n \tunsigned int reg, timeout=0, resets=1;\n \tunsigned long flags;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \t/*\t Take out of PM setting first */\n \tif ((SMC_GET_PMT_CTRL(lp) & PMT_CTRL_READY_) == 0) {\n@@ -272,7 +272,7 @@ static void smc911x_enable(struct net_de\n \tunsigned mask, cfg, cr;\n \tunsigned long flags;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \tSMC_SET_MAC_ADDR(lp, dev->dev_addr);\n \n@@ -329,7 +329,7 @@ static void smc911x_shutdown(struct net_\n \tunsigned cr;\n \tunsigned long flags;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", CARDNAME, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", CARDNAME, __func__);\n \n \t/* Disable IRQ's */\n \tSMC_SET_INT_EN(lp, 0);\n@@ -348,7 +348,7 @@ static inline void smc911x_drop_pkt(stru\n \tstruct smc911x_local *lp = netdev_priv(dev);\n \tunsigned int fifo_count, timeout, reg;\n \n-\tDBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, \"%s: --> %s\\n\", CARDNAME, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, \"%s: --> %s\\n\", CARDNAME, __func__);\n \tfifo_count = SMC_GET_RX_FIFO_INF(lp) & 0xFFFF;\n \tif (fifo_count <= 4) {\n \t\t/* Manually dump the packet data */\n@@ -382,7 +382,7 @@ static inline void\t smc911x_rcv(struct n\n \tunsigned char *data;\n \n \tDBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, \"%s: --> %s\\n\",\n-\t\tdev->name, __FUNCTION__);\n+\t\tdev->name, __func__);\n \tstatus = SMC_GET_RX_STS_FIFO(lp);\n \tDBG(SMC_DEBUG_RX, \"%s: Rx pkt len %d status 0x%08x \\n\",\n \t\tdev->name, (status & 0x3fff0000) >> 16, status & 0xc000ffff);\n@@ -460,7 +460,7 @@ static void smc911x_hardware_send_pkt(st\n \tunsigned char *buf;\n \tunsigned long flags;\n \n-\tDBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, \"%s: --> %s\\n\", dev->name, __func__);\n \tBUG_ON(lp->pending_tx_skb == NULL);\n \n \tskb = lp->pending_tx_skb;\n@@ -524,7 +524,7 @@ static int smc911x_hard_start_xmit(struc\n \tunsigned long flags;\n \n \tDBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, \"%s: --> %s\\n\",\n-\t\tdev->name, __FUNCTION__);\n+\t\tdev->name, __func__);\n \n \tBUG_ON(lp->pending_tx_skb != NULL);\n \n@@ -596,7 +596,7 @@ static void smc911x_tx(struct net_device\n \tunsigned int tx_status;\n \n \tDBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, \"%s: --> %s\\n\",\n-\t\tdev->name, __FUNCTION__);\n+\t\tdev->name, __func__);\n \n \t/* Collect the TX status */\n \twhile (((SMC_GET_TX_FIFO_INF(lp) & TX_FIFO_INF_TSUSED_) >> 16) != 0) {\n@@ -647,7 +647,7 @@ static int smc911x_phy_read(struct net_d\n \tSMC_GET_MII(lp, phyreg, phyaddr, phydata);\n \n \tDBG(SMC_DEBUG_MISC, \"%s: phyaddr=0x%x, phyreg=0x%02x, phydata=0x%04x\\n\",\n-\t\t__FUNCTION__, phyaddr, phyreg, phydata);\n+\t\t__func__, phyaddr, phyreg, phydata);\n \treturn phydata;\n }\n \n@@ -661,7 +661,7 @@ static void smc911x_phy_write(struct net\n \tstruct smc911x_local *lp = netdev_priv(dev);\n \n \tDBG(SMC_DEBUG_MISC, \"%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\\n\",\n-\t\t__FUNCTION__, phyaddr, phyreg, phydata);\n+\t\t__func__, phyaddr, phyreg, phydata);\n \n \tSMC_SET_MII(lp, phyreg, phyaddr, phydata);\n }\n@@ -676,7 +676,7 @@ static void smc911x_phy_detect(struct ne\n \tint phyaddr;\n \tunsigned int cfg, id1, id2;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \tlp->phy_type = 0;\n \n@@ -746,7 +746,7 @@ static int smc911x_phy_fixed(struct net_\n \tint phyaddr = lp->mii.phy_id;\n \tint bmcr;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \t/* Enter Link Disable state */\n \tSMC_GET_PHY_BMCR(lp, phyaddr, bmcr);\n@@ -793,7 +793,7 @@ static int smc911x_phy_reset(struct net_\n \tunsigned long flags;\n \tunsigned int reg;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s()\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s()\\n\", dev->name, __func__);\n \n \tspin_lock_irqsave(&lp->lock, flags);\n \treg = SMC_GET_PMT_CTRL(lp);\n@@ -852,7 +852,7 @@ static void smc911x_phy_check_media(stru\n \tint phyaddr = lp->mii.phy_id;\n \tunsigned int bmcr, cr;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \tif (mii_check_media(&lp->mii, netif_msg_link(lp), init)) {\n \t\t/* duplex state has changed */\n@@ -892,7 +892,7 @@ static void smc911x_phy_configure(struct\n \tint status;\n \tunsigned long flags;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s()\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s()\\n\", dev->name, __func__);\n \n \t/*\n \t * We should not be called if phy_type is zero.\n@@ -985,7 +985,7 @@ static void smc911x_phy_interrupt(struct\n \tint phyaddr = lp->mii.phy_id;\n \tint status;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \tif (lp->phy_type == 0)\n \t\treturn;\n@@ -1013,7 +1013,7 @@ static irqreturn_t smc911x_interrupt(int\n \tunsigned int rx_overrun=0, cr, pkts;\n \tunsigned long flags;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \tspin_lock_irqsave(&lp->lock, flags);\n \n@@ -1188,7 +1188,7 @@ smc911x_tx_dma_irq(int dma, void *data)\n \tstruct sk_buff *skb = lp->current_tx_skb;\n \tunsigned long flags;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \tDBG(SMC_DEBUG_TX | SMC_DEBUG_DMA, \"%s: TX DMA irq handler\\n\", dev->name);\n \t/* Clear the DMA interrupt sources */\n@@ -1224,7 +1224,7 @@ smc911x_rx_dma_irq(int dma, void *data)\n \tunsigned long flags;\n \tunsigned int pkts;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \tDBG(SMC_DEBUG_RX | SMC_DEBUG_DMA, \"%s: RX DMA irq handler\\n\", dev->name);\n \t/* Clear the DMA interrupt sources */\n \tSMC_DMA_ACK_IRQ(dev, dma);\n@@ -1272,7 +1272,7 @@ static void smc911x_timeout(struct net_d\n \tint status, mask;\n \tunsigned long flags;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \tspin_lock_irqsave(&lp->lock, flags);\n \tstatus = SMC_GET_INT(lp);\n@@ -1310,7 +1310,7 @@ static void smc911x_set_multicast_list(s\n \tunsigned int mcr, update_multicast = 0;\n \tunsigned long flags;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \tspin_lock_irqsave(&lp->lock, flags);\n \tSMC_GET_MAC_CR(lp, mcr);\n@@ -1412,7 +1412,7 @@ smc911x_open(struct net_device *dev)\n {\n \tstruct smc911x_local *lp = netdev_priv(dev);\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \t/*\n \t * Check that the address is valid.  If its not, refuse\n@@ -1420,7 +1420,7 @@ smc911x_open(struct net_device *dev)\n \t * address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx\n \t */\n \tif (!is_valid_ether_addr(dev->dev_addr)) {\n-\t\tPRINTK(\"%s: no valid ethernet hw addr\\n\", __FUNCTION__);\n+\t\tPRINTK(\"%s: no valid ethernet hw addr\\n\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1449,7 +1449,7 @@ static int smc911x_close(struct net_devi\n {\n \tstruct smc911x_local *lp = netdev_priv(dev);\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \tnetif_stop_queue(dev);\n \tnetif_carrier_off(dev);\n@@ -1483,7 +1483,7 @@ smc911x_ethtool_getsettings(struct net_d\n \tint ret, status;\n \tunsigned long flags;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \tcmd->maxtxpkt = 1;\n \tcmd->maxrxpkt = 1;\n \n@@ -1621,7 +1621,7 @@ static int smc911x_ethtool_wait_eeprom_r\n \tfor(timeout=10;(e2p_cmd & E2P_CMD_EPC_BUSY_) && timeout; timeout--) {\n \t\tif (e2p_cmd & E2P_CMD_EPC_TIMEOUT_) {\n \t\t\tPRINTK(\"%s: %s timeout waiting for EEPROM to respond\\n\",\n-\t\t\t\tdev->name, __FUNCTION__);\n+\t\t\t\tdev->name, __func__);\n \t\t\treturn -EFAULT;\n \t\t}\n \t\tmdelay(1);\n@@ -1629,7 +1629,7 @@ static int smc911x_ethtool_wait_eeprom_r\n \t}\n \tif (timeout == 0) {\n \t\tPRINTK(\"%s: %s timeout waiting for EEPROM CMD not busy\\n\",\n-\t\t\tdev->name, __FUNCTION__);\n+\t\t\tdev->name, __func__);\n \t\treturn -ETIMEDOUT;\n \t}\n \treturn 0;\n@@ -1742,7 +1742,7 @@ static int __init smc911x_findirq(struct\n \tint timeout = 20;\n \tunsigned long cookie;\n \n-\tDBG(SMC_DEBUG_FUNC, \"--> %s\\n\", __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"--> %s\\n\", __func__);\n \n \tcookie = probe_irq_on();\n \n@@ -1808,7 +1808,7 @@ static int __init smc911x_probe(struct n\n \tconst char *version_string;\n \tunsigned long irq_flags;\n \n-\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"%s: --> %s\\n\", dev->name, __func__);\n \n \t/* First, see if the endian word is recognized */\n \tval = SMC_GET_BYTE_TEST(lp);\n@@ -2058,7 +2058,7 @@ static int smc911x_drv_probe(struct plat\n \tunsigned int *addr;\n \tint ret;\n \n-\tDBG(SMC_DEBUG_FUNC, \"--> %s\\n\",  __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"--> %s\\n\",  __func__);\n \tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n \tif (!res) {\n \t\tret = -ENODEV;\n@@ -2129,7 +2129,7 @@ static int smc911x_drv_remove(struct pla\n \tstruct smc911x_local *lp = netdev_priv(ndev);\n \tstruct resource *res;\n \n-\tDBG(SMC_DEBUG_FUNC, \"--> %s\\n\", __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"--> %s\\n\", __func__);\n \tplatform_set_drvdata(pdev, NULL);\n \n \tunregister_netdev(ndev);\n@@ -2159,7 +2159,7 @@ static int smc911x_drv_suspend(struct pl\n \tstruct net_device *ndev = platform_get_drvdata(dev);\n \tstruct smc911x_local *lp = netdev_priv(ndev);\n \n-\tDBG(SMC_DEBUG_FUNC, \"--> %s\\n\", __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"--> %s\\n\", __func__);\n \tif (ndev) {\n \t\tif (netif_running(ndev)) {\n \t\t\tnetif_device_detach(ndev);\n@@ -2177,7 +2177,7 @@ static int smc911x_drv_resume(struct pla\n {\n \tstruct net_device *ndev = platform_get_drvdata(dev);\n \n-\tDBG(SMC_DEBUG_FUNC, \"--> %s\\n\", __FUNCTION__);\n+\tDBG(SMC_DEBUG_FUNC, \"--> %s\\n\", __func__);\n \tif (ndev) {\n \t\tstruct smc911x_local *lp = netdev_priv(ndev);\n \ndiff -puN drivers/net/smc91x.c~drivers-net-replace-__function__-with-__func__ drivers/net/smc91x.c\n--- a/drivers/net/smc91x.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/smc91x.c\n@@ -270,7 +270,7 @@ static void smc_reset(struct net_device \n \tunsigned int ctl, cfg;\n \tstruct sk_buff *pending_skb;\n \n-\tDBG(2, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", dev->name, __func__);\n \n \t/* Disable all interrupts, block TX tasklet */\n \tspin_lock_irq(&lp->lock);\n@@ -363,7 +363,7 @@ static void smc_enable(struct net_device\n \tvoid __iomem *ioaddr = lp->base;\n \tint mask;\n \n-\tDBG(2, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", dev->name, __func__);\n \n \t/* see the header file for options in TCR/RCR DEFAULT */\n \tSMC_SELECT_BANK(lp, 0);\n@@ -397,7 +397,7 @@ static void smc_shutdown(struct net_devi\n \tvoid __iomem *ioaddr = lp->base;\n \tstruct sk_buff *pending_skb;\n \n-\tDBG(2, \"%s: %s\\n\", CARDNAME, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", CARDNAME, __func__);\n \n \t/* no more interrupts for me */\n \tspin_lock_irq(&lp->lock);\n@@ -430,7 +430,7 @@ static inline void  smc_rcv(struct net_d\n \tvoid __iomem *ioaddr = lp->base;\n \tunsigned int packet_number, status, packet_len;\n \n-\tDBG(3, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(3, \"%s: %s\\n\", dev->name, __func__);\n \n \tpacket_number = SMC_GET_RXFIFO(lp);\n \tif (unlikely(packet_number & RXFIFO_REMPTY)) {\n@@ -577,7 +577,7 @@ static void smc_hardware_send_pkt(unsign\n \tunsigned int packet_no, len;\n \tunsigned char *buf;\n \n-\tDBG(3, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(3, \"%s: %s\\n\", dev->name, __func__);\n \n \tif (!smc_special_trylock(&lp->lock)) {\n \t\tnetif_stop_queue(dev);\n@@ -662,7 +662,7 @@ static int smc_hard_start_xmit(struct sk\n \tvoid __iomem *ioaddr = lp->base;\n \tunsigned int numPages, poll_count, status;\n \n-\tDBG(3, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(3, \"%s: %s\\n\", dev->name, __func__);\n \n \tBUG_ON(lp->pending_tx_skb != NULL);\n \n@@ -734,7 +734,7 @@ static void smc_tx(struct net_device *de\n \tvoid __iomem *ioaddr = lp->base;\n \tunsigned int saved_packet, packet_no, tx_status, pkt_len;\n \n-\tDBG(3, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(3, \"%s: %s\\n\", dev->name, __func__);\n \n \t/* If the TX FIFO is empty then nothing to do */\n \tpacket_no = SMC_GET_TXFIFO(lp);\n@@ -856,7 +856,7 @@ static int smc_phy_read(struct net_devic\n \tSMC_SET_MII(lp, SMC_GET_MII(lp) & ~(MII_MCLK|MII_MDOE|MII_MDO));\n \n \tDBG(3, \"%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\\n\",\n-\t\t__FUNCTION__, phyaddr, phyreg, phydata);\n+\t\t__func__, phyaddr, phyreg, phydata);\n \n \tSMC_SELECT_BANK(lp, 2);\n \treturn phydata;\n@@ -883,7 +883,7 @@ static void smc_phy_write(struct net_dev\n \tSMC_SET_MII(lp, SMC_GET_MII(lp) & ~(MII_MCLK|MII_MDOE|MII_MDO));\n \n \tDBG(3, \"%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\\n\",\n-\t\t__FUNCTION__, phyaddr, phyreg, phydata);\n+\t\t__func__, phyaddr, phyreg, phydata);\n \n \tSMC_SELECT_BANK(lp, 2);\n }\n@@ -896,7 +896,7 @@ static void smc_phy_detect(struct net_de\n \tstruct smc_local *lp = netdev_priv(dev);\n \tint phyaddr;\n \n-\tDBG(2, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", dev->name, __func__);\n \n \tlp->phy_type = 0;\n \n@@ -935,7 +935,7 @@ static int smc_phy_fixed(struct net_devi\n \tint phyaddr = lp->mii.phy_id;\n \tint bmcr, cfg1;\n \n-\tDBG(3, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(3, \"%s: %s\\n\", dev->name, __func__);\n \n \t/* Enter Link Disable state */\n \tcfg1 = smc_phy_read(dev, phyaddr, PHY_CFG1_REG);\n@@ -1168,7 +1168,7 @@ static void smc_phy_interrupt(struct net\n \tint phyaddr = lp->mii.phy_id;\n \tint phy18;\n \n-\tDBG(2, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", dev->name, __func__);\n \n \tif (lp->phy_type == 0)\n \t\treturn;\n@@ -1236,7 +1236,7 @@ static irqreturn_t smc_interrupt(int irq\n \tint status, mask, timeout, card_stats;\n \tint saved_pointer;\n \n-\tDBG(3, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(3, \"%s: %s\\n\", dev->name, __func__);\n \n \tspin_lock(&lp->lock);\n \n@@ -1358,7 +1358,7 @@ static void smc_timeout(struct net_devic\n \tvoid __iomem *ioaddr = lp->base;\n \tint status, mask, eph_st, meminfo, fifo;\n \n-\tDBG(2, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", dev->name, __func__);\n \n \tspin_lock_irq(&lp->lock);\n \tstatus = SMC_GET_INT(lp);\n@@ -1402,7 +1402,7 @@ static void smc_set_multicast_list(struc\n \tunsigned char multicast_table[8];\n \tint update_multicast = 0;\n \n-\tDBG(2, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", dev->name, __func__);\n \n \tif (dev->flags & IFF_PROMISC) {\n \t\tDBG(2, \"%s: RCR_PRMS\\n\", dev->name);\n@@ -1505,7 +1505,7 @@ smc_open(struct net_device *dev)\n {\n \tstruct smc_local *lp = netdev_priv(dev);\n \n-\tDBG(2, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", dev->name, __func__);\n \n \t/*\n \t * Check that the address is valid.  If its not, refuse\n@@ -1513,7 +1513,7 @@ smc_open(struct net_device *dev)\n \t * address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx\n \t */\n \tif (!is_valid_ether_addr(dev->dev_addr)) {\n-\t\tPRINTK(\"%s: no valid ethernet hw addr\\n\", __FUNCTION__);\n+\t\tPRINTK(\"%s: no valid ethernet hw addr\\n\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1559,7 +1559,7 @@ static int smc_close(struct net_device *\n {\n \tstruct smc_local *lp = netdev_priv(dev);\n \n-\tDBG(2, \"%s: %s\\n\", dev->name, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", dev->name, __func__);\n \n \tnetif_stop_queue(dev);\n \tnetif_carrier_off(dev);\n@@ -1702,7 +1702,7 @@ static int __init smc_findirq(struct smc\n \tint timeout = 20;\n \tunsigned long cookie;\n \n-\tDBG(2, \"%s: %s\\n\", CARDNAME, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", CARDNAME, __func__);\n \n \tcookie = probe_irq_on();\n \n@@ -1780,7 +1780,7 @@ static int __init smc_probe(struct net_d\n \tconst char *version_string;\n \tDECLARE_MAC_BUF(mac);\n \n-\tDBG(2, \"%s: %s\\n\", CARDNAME, __FUNCTION__);\n+\tDBG(2, \"%s: %s\\n\", CARDNAME, __func__);\n \n \t/* First, see if the high byte is 0x33 */\n \tval = SMC_CURRENT_BANK(lp);\ndiff -puN drivers/net/tehuti.h~drivers-net-replace-__function__-with-__func__ drivers/net/tehuti.h\n--- a/drivers/net/tehuti.h~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/tehuti.h\n@@ -539,22 +539,22 @@ struct txd_desc {\n \n #define ERR(fmt, args...) printk(KERN_ERR fmt, ## args)\n #define DBG2(fmt, args...)\t\\\n-\tprintk(KERN_ERR  \"%s:%-5d: \" fmt, __FUNCTION__, __LINE__, ## args)\n+\tprintk(KERN_ERR  \"%s:%-5d: \" fmt, __func__, __LINE__, ## args)\n \n #define BDX_ASSERT(x) BUG_ON(x)\n \n #ifdef DEBUG\n \n #define ENTER          do { \\\n-\tprintk(KERN_ERR  \"%s:%-5d: ENTER\\n\", __FUNCTION__, __LINE__); \\\n+\tprintk(KERN_ERR  \"%s:%-5d: ENTER\\n\", __func__, __LINE__); \\\n } while (0)\n \n #define RET(args...)   do { \\\n-\tprintk(KERN_ERR  \"%s:%-5d: RETURN\\n\", __FUNCTION__, __LINE__); \\\n+\tprintk(KERN_ERR  \"%s:%-5d: RETURN\\n\", __func__, __LINE__); \\\n return args; } while (0)\n \n #define DBG(fmt, args...)\t\\\n-\tprintk(KERN_ERR  \"%s:%-5d: \" fmt, __FUNCTION__, __LINE__, ## args)\n+\tprintk(KERN_ERR  \"%s:%-5d: \" fmt, __func__, __LINE__, ## args)\n #else\n #define ENTER         do {  } while (0)\n #define RET(args...)   return args\ndiff -puN drivers/net/tsi108_eth.c~drivers-net-replace-__function__-with-__func__ drivers/net/tsi108_eth.c\n--- a/drivers/net/tsi108_eth.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/tsi108_eth.c\n@@ -263,7 +263,7 @@ static inline void tsi108_write_tbi(stru\n \t\t\treturn;\n \t\tudelay(10);\n \t}\n-\tprintk(KERN_ERR \"%s function time out \\n\", __FUNCTION__);\n+\tprintk(KERN_ERR \"%s function time out \\n\", __func__);\n }\n \n static int mii_speed(struct mii_if_info *mii)\n@@ -1059,7 +1059,7 @@ static void tsi108_stop_ethernet(struct \n \t\t\treturn;\n \t\tudelay(10);\n \t}\n-\tprintk(KERN_ERR \"%s function time out \\n\", __FUNCTION__);\n+\tprintk(KERN_ERR \"%s function time out \\n\", __func__);\n }\n \n static void tsi108_reset_ether(struct tsi108_prv_data * data)\n@@ -1244,7 +1244,7 @@ static void tsi108_init_phy(struct net_d\n \t\tudelay(10);\n \t}\n \tif (i == 0)\n-\t\tprintk(KERN_ERR \"%s function time out \\n\", __FUNCTION__);\n+\t\tprintk(KERN_ERR \"%s function time out \\n\", __func__);\n \n \tif (data->phy_type == TSI108_PHY_BCM54XX) {\n \t\ttsi108_write_mii(data, 0x09, 0x0300);\ndiff -puN drivers/net/ucc_geth.c~drivers-net-replace-__function__-with-__func__ drivers/net/ucc_geth.c\n--- a/drivers/net/ucc_geth.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/ucc_geth.c\n@@ -400,7 +400,7 @@ static struct enet_addr_container *get_e\n \tenet_addr_cont = kmalloc(sizeof(struct enet_addr_container), GFP_KERNEL);\n \tif (!enet_addr_cont) {\n \t\tugeth_err(\"%s: No memory for enet_addr_container object.\",\n-\t\t\t  __FUNCTION__);\n+\t\t\t  __func__);\n \t\treturn NULL;\n \t}\n \n@@ -427,7 +427,7 @@ static int hw_add_addr_in_paddr(struct u\n \tstruct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;\n \n \tif (!(paddr_num < NUM_OF_PADDRS)) {\n-\t\tugeth_warn(\"%s: Illegal paddr_num.\", __FUNCTION__);\n+\t\tugeth_warn(\"%s: Illegal paddr_num.\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -447,7 +447,7 @@ static int hw_clear_addr_in_paddr(struct\n \tstruct ucc_geth_82xx_address_filtering_pram __iomem *p_82xx_addr_filt;\n \n \tif (!(paddr_num < NUM_OF_PADDRS)) {\n-\t\tugeth_warn(\"%s: Illagel paddr_num.\", __FUNCTION__);\n+\t\tugeth_warn(\"%s: Illagel paddr_num.\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1441,7 +1441,7 @@ static int adjust_enet_interface(struct \n \tu32 upsmr, maccfg2, tbiBaseAddress;\n \tu16 value;\n \n-\tugeth_vdbg(\"%s: IN\", __FUNCTION__);\n+\tugeth_vdbg(\"%s: IN\", __func__);\n \n \tug_info = ugeth->ug_info;\n \tug_regs = ugeth->ug_regs;\n@@ -1504,7 +1504,7 @@ static int adjust_enet_interface(struct \n \tif (ret_val != 0) {\n \t\tif (netif_msg_probe(ugeth))\n \t\t\tugeth_err(\"%s: Preamble length must be between 3 and 7 inclusive.\",\n-\t\t\t     __FUNCTION__);\n+\t\t\t     __func__);\n \t\treturn ret_val;\n \t}\n \n@@ -1744,7 +1744,7 @@ static int ugeth_enable(struct ucc_geth_\n \t/* check if the UCC number is in range. */\n \tif (ugeth->ug_info->uf_info.ucc_num >= UCC_MAX_NUM) {\n \t\tif (netif_msg_probe(ugeth))\n-\t\t\tugeth_err(\"%s: ucc_num out of range.\", __FUNCTION__);\n+\t\t\tugeth_err(\"%s: ucc_num out of range.\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1773,7 +1773,7 @@ static int ugeth_disable(struct ucc_geth\n \t/* check if the UCC number is in range. */\n \tif (ugeth->ug_info->uf_info.ucc_num >= UCC_MAX_NUM) {\n \t\tif (netif_msg_probe(ugeth))\n-\t\t\tugeth_err(\"%s: ucc_num out of range.\", __FUNCTION__);\n+\t\t\tugeth_err(\"%s: ucc_num out of range.\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -2062,7 +2062,7 @@ static int ugeth_82xx_filtering_add_addr\n \t\tugeth_warn\n \t\t    (\"%s: multicast address added to paddr will have no \"\n \t\t     \"effect - is this what you wanted?\",\n-\t\t     __FUNCTION__);\n+\t\t     __func__);\n \n \tugeth->indAddrRegUsed[paddr_num] = 1;\t/* mark this paddr as used */\n \t/* store address in our database */\n@@ -2278,7 +2278,7 @@ static void ucc_geth_stop(struct ucc_get\n \tstruct phy_device *phydev = ugeth->phydev;\n \tu32 tempval;\n \n-\tugeth_vdbg(\"%s: IN\", __FUNCTION__);\n+\tugeth_vdbg(\"%s: IN\", __func__);\n \n \t/* Disable the controller */\n \tugeth_disable(ugeth, COMM_DIR_RX_AND_TX);\n@@ -2315,7 +2315,7 @@ static int ucc_struct_init(struct ucc_ge\n \t      (uf_info->bd_mem_part == MEM_PART_MURAM))) {\n \t\tif (netif_msg_probe(ugeth))\n \t\t\tugeth_err(\"%s: Bad memory partition value.\",\n-\t\t\t\t\t__FUNCTION__);\n+\t\t\t\t\t__func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -2327,7 +2327,7 @@ static int ucc_struct_init(struct ucc_ge\n \t\t\tif (netif_msg_probe(ugeth))\n \t\t\t\tugeth_err\n \t\t\t\t    (\"%s: Rx BD ring length must be multiple of 4, no smaller than 8.\",\n-\t\t\t\t\t__FUNCTION__);\n+\t\t\t\t\t__func__);\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\n@@ -2338,7 +2338,7 @@ static int ucc_struct_init(struct ucc_ge\n \t\t\tif (netif_msg_probe(ugeth))\n \t\t\t\tugeth_err\n \t\t\t\t    (\"%s: Tx BD ring length must be no smaller than 2.\",\n-\t\t\t\t     __FUNCTION__);\n+\t\t\t\t     __func__);\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\n@@ -2349,21 +2349,21 @@ static int ucc_struct_init(struct ucc_ge\n \t\tif (netif_msg_probe(ugeth))\n \t\t\tugeth_err\n \t\t\t    (\"%s: max_rx_buf_length must be non-zero multiple of 128.\",\n-\t\t\t     __FUNCTION__);\n+\t\t\t     __func__);\n \t\treturn -EINVAL;\n \t}\n \n \t/* num Tx queues */\n \tif (ug_info->numQueuesTx > NUM_TX_QUEUES) {\n \t\tif (netif_msg_probe(ugeth))\n-\t\t\tugeth_err(\"%s: number of tx queues too large.\", __FUNCTION__);\n+\t\t\tugeth_err(\"%s: number of tx queues too large.\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n \t/* num Rx queues */\n \tif (ug_info->numQueuesRx > NUM_RX_QUEUES) {\n \t\tif (netif_msg_probe(ugeth))\n-\t\t\tugeth_err(\"%s: number of rx queues too large.\", __FUNCTION__);\n+\t\t\tugeth_err(\"%s: number of rx queues too large.\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -2374,7 +2374,7 @@ static int ucc_struct_init(struct ucc_ge\n \t\t\t\tugeth_err\n \t\t\t\t    (\"%s: VLAN priority table entry must not be\"\n \t\t\t\t\t\" larger than number of Rx queues.\",\n-\t\t\t\t     __FUNCTION__);\n+\t\t\t\t     __func__);\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\n@@ -2386,7 +2386,7 @@ static int ucc_struct_init(struct ucc_ge\n \t\t\t\tugeth_err\n \t\t\t\t    (\"%s: IP priority table entry must not be\"\n \t\t\t\t\t\" larger than number of Rx queues.\",\n-\t\t\t\t     __FUNCTION__);\n+\t\t\t\t     __func__);\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\n@@ -2394,7 +2394,7 @@ static int ucc_struct_init(struct ucc_ge\n \tif (ug_info->cam && !ug_info->ecamptr) {\n \t\tif (netif_msg_probe(ugeth))\n \t\t\tugeth_err(\"%s: If cam mode is chosen, must supply cam ptr.\",\n-\t\t\t\t  __FUNCTION__);\n+\t\t\t\t  __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -2404,7 +2404,7 @@ static int ucc_struct_init(struct ucc_ge\n \t\tif (netif_msg_probe(ugeth))\n \t\t\tugeth_err(\"%s: Number of station addresses greater than 1 \"\n \t\t\t\t  \"not allowed in extended parsing mode.\",\n-\t\t\t\t  __FUNCTION__);\n+\t\t\t\t  __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -2418,7 +2418,7 @@ static int ucc_struct_init(struct ucc_ge\n \t/* Initialize the general fast UCC block. */\n \tif (ucc_fast_init(uf_info, &ugeth->uccf)) {\n \t\tif (netif_msg_probe(ugeth))\n-\t\t\tugeth_err(\"%s: Failed to init uccf.\", __FUNCTION__);\n+\t\t\tugeth_err(\"%s: Failed to init uccf.\", __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -ENOMEM;\n \t}\n@@ -2448,7 +2448,7 @@ static int ucc_geth_startup(struct ucc_g\n \tu8 __iomem *endOfRing;\n \tu8 numThreadsRxNumerical, numThreadsTxNumerical;\n \n-\tugeth_vdbg(\"%s: IN\", __FUNCTION__);\n+\tugeth_vdbg(\"%s: IN\", __func__);\n \tuccf = ugeth->uccf;\n \tug_info = ugeth->ug_info;\n \tuf_info = &ug_info->uf_info;\n@@ -2474,7 +2474,7 @@ static int ucc_geth_startup(struct ucc_g\n \tdefault:\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err(\"%s: Bad number of Rx threads value.\",\n-\t\t\t\t       \t__FUNCTION__);\n+\t\t\t\t       \t__func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -EINVAL;\n \t\tbreak;\n@@ -2499,7 +2499,7 @@ static int ucc_geth_startup(struct ucc_g\n \tdefault:\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err(\"%s: Bad number of Tx threads value.\",\n-\t\t\t\t       \t__FUNCTION__);\n+\t\t\t\t       \t__func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -EINVAL;\n \t\tbreak;\n@@ -2553,7 +2553,7 @@ static int ucc_geth_startup(struct ucc_g\n \tif (ret_val != 0) {\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err(\"%s: IPGIFG initialization parameter too large.\",\n-\t\t\t\t  __FUNCTION__);\n+\t\t\t\t  __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn ret_val;\n \t}\n@@ -2571,7 +2571,7 @@ static int ucc_geth_startup(struct ucc_g\n \tif (ret_val != 0) {\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err(\"%s: Half Duplex initialization parameter too large.\",\n-\t\t\t  __FUNCTION__);\n+\t\t\t  __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn ret_val;\n \t}\n@@ -2626,7 +2626,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\t\tif (netif_msg_ifup(ugeth))\n \t\t\t\tugeth_err\n \t\t\t\t    (\"%s: Can not allocate memory for Tx bd rings.\",\n-\t\t\t\t     __FUNCTION__);\n+\t\t\t\t     __func__);\n \t\t\tucc_geth_memclean(ugeth);\n \t\t\treturn -ENOMEM;\n \t\t}\n@@ -2662,7 +2662,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\t\tif (netif_msg_ifup(ugeth))\n \t\t\t\tugeth_err\n \t\t\t\t    (\"%s: Can not allocate memory for Rx bd rings.\",\n-\t\t\t\t     __FUNCTION__);\n+\t\t\t\t     __func__);\n \t\t\tucc_geth_memclean(ugeth);\n \t\t\treturn -ENOMEM;\n \t\t}\n@@ -2678,7 +2678,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (ugeth->tx_skbuff[j] == NULL) {\n \t\t\tif (netif_msg_ifup(ugeth))\n \t\t\t\tugeth_err(\"%s: Could not allocate tx_skbuff\",\n-\t\t\t\t\t  __FUNCTION__);\n+\t\t\t\t\t  __func__);\n \t\t\tucc_geth_memclean(ugeth);\n \t\t\treturn -ENOMEM;\n \t\t}\n@@ -2710,7 +2710,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (ugeth->rx_skbuff[j] == NULL) {\n \t\t\tif (netif_msg_ifup(ugeth))\n \t\t\t\tugeth_err(\"%s: Could not allocate rx_skbuff\",\n-\t\t\t\t\t  __FUNCTION__);\n+\t\t\t\t\t  __func__);\n \t\t\tucc_geth_memclean(ugeth);\n \t\t\treturn -ENOMEM;\n \t\t}\n@@ -2744,7 +2744,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err\n \t\t\t    (\"%s: Can not allocate DPRAM memory for p_tx_glbl_pram.\",\n-\t\t\t     __FUNCTION__);\n+\t\t\t     __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -ENOMEM;\n \t}\n@@ -2767,7 +2767,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err\n \t\t\t    (\"%s: Can not allocate DPRAM memory for p_thread_data_tx.\",\n-\t\t\t     __FUNCTION__);\n+\t\t\t     __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -ENOMEM;\n \t}\n@@ -2797,7 +2797,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err\n \t\t\t    (\"%s: Can not allocate DPRAM memory for p_send_q_mem_reg.\",\n-\t\t\t     __FUNCTION__);\n+\t\t\t     __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -ENOMEM;\n \t}\n@@ -2841,7 +2841,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\t\tif (netif_msg_ifup(ugeth))\n \t\t\t\tugeth_err\n \t\t\t\t (\"%s: Can not allocate DPRAM memory for p_scheduler.\",\n-\t\t\t\t     __FUNCTION__);\n+\t\t\t\t     __func__);\n \t\t\tucc_geth_memclean(ugeth);\n \t\t\treturn -ENOMEM;\n \t\t}\n@@ -2892,7 +2892,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\t\t\tugeth_err\n \t\t\t\t    (\"%s: Can not allocate DPRAM memory for\"\n \t\t\t\t\t\" p_tx_fw_statistics_pram.\",\n-\t\t\t\t       \t__FUNCTION__);\n+\t\t\t\t       \t__func__);\n \t\t\tucc_geth_memclean(ugeth);\n \t\t\treturn -ENOMEM;\n \t\t}\n@@ -2932,7 +2932,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err\n \t\t\t    (\"%s: Can not allocate DPRAM memory for p_rx_glbl_pram.\",\n-\t\t\t     __FUNCTION__);\n+\t\t\t     __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -ENOMEM;\n \t}\n@@ -2954,7 +2954,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err\n \t\t\t    (\"%s: Can not allocate DPRAM memory for p_thread_data_rx.\",\n-\t\t\t     __FUNCTION__);\n+\t\t\t     __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -ENOMEM;\n \t}\n@@ -2978,7 +2978,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\t\tif (netif_msg_ifup(ugeth))\n \t\t\t\tugeth_err\n \t\t\t\t\t(\"%s: Can not allocate DPRAM memory for\"\n-\t\t\t\t\t\" p_rx_fw_statistics_pram.\", __FUNCTION__);\n+\t\t\t\t\t\" p_rx_fw_statistics_pram.\", __func__);\n \t\t\tucc_geth_memclean(ugeth);\n \t\t\treturn -ENOMEM;\n \t\t}\n@@ -3001,7 +3001,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err\n \t\t\t    (\"%s: Can not allocate DPRAM memory for\"\n-\t\t\t\t\" p_rx_irq_coalescing_tbl.\", __FUNCTION__);\n+\t\t\t\t\" p_rx_irq_coalescing_tbl.\", __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -ENOMEM;\n \t}\n@@ -3070,7 +3070,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err\n \t\t\t    (\"%s: Can not allocate DPRAM memory for p_rx_bd_qs_tbl.\",\n-\t\t\t     __FUNCTION__);\n+\t\t\t     __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -ENOMEM;\n \t}\n@@ -3147,7 +3147,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (!ug_info->extendedFilteringChainPointer) {\n \t\t\tif (netif_msg_ifup(ugeth))\n \t\t\t\tugeth_err(\"%s: Null Extended Filtering Chain Pointer.\",\n-\t\t\t\t\t  __FUNCTION__);\n+\t\t\t\t\t  __func__);\n \t\t\tucc_geth_memclean(ugeth);\n \t\t\treturn -EINVAL;\n \t\t}\n@@ -3161,7 +3161,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\t\tif (netif_msg_ifup(ugeth))\n \t\t\t\tugeth_err\n \t\t\t\t\t(\"%s: Can not allocate DPRAM memory for\"\n-\t\t\t\t\t\" p_exf_glbl_param.\", __FUNCTION__);\n+\t\t\t\t\t\" p_exf_glbl_param.\", __func__);\n \t\t\tucc_geth_memclean(ugeth);\n \t\t\treturn -ENOMEM;\n \t\t}\n@@ -3209,7 +3209,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err\n \t\t\t    (\"%s: Can not allocate memory for\"\n-\t\t\t\t\" p_UccInitEnetParamShadows.\", __FUNCTION__);\n+\t\t\t\t\" p_UccInitEnetParamShadows.\", __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -ENOMEM;\n \t}\n@@ -3244,7 +3244,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tQE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_16_BYTES)) {\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err(\"%s: Invalid largest External Lookup Key Size.\",\n-\t\t\t\t  __FUNCTION__);\n+\t\t\t\t  __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -EINVAL;\n \t}\n@@ -3271,7 +3271,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tug_info->riscRx, 1)) != 0) {\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\t\tugeth_err(\"%s: Can not fill p_init_enet_param_shadow.\",\n-\t\t\t\t\t__FUNCTION__);\n+\t\t\t\t\t__func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn ret_val;\n \t}\n@@ -3287,7 +3287,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\t\t\t    ug_info->riscTx, 0)) != 0) {\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err(\"%s: Can not fill p_init_enet_param_shadow.\",\n-\t\t\t\t  __FUNCTION__);\n+\t\t\t\t  __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn ret_val;\n \t}\n@@ -3297,7 +3297,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif ((ret_val = rx_bd_buffer_set(ugeth, (u8) i)) != 0) {\n \t\t\tif (netif_msg_ifup(ugeth))\n \t\t\t\tugeth_err(\"%s: Can not fill Rx bds with buffers.\",\n-\t\t\t\t\t  __FUNCTION__);\n+\t\t\t\t\t  __func__);\n \t\t\tucc_geth_memclean(ugeth);\n \t\t\treturn ret_val;\n \t\t}\n@@ -3309,7 +3309,7 @@ static int ucc_geth_startup(struct ucc_g\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err\n \t\t\t    (\"%s: Can not allocate DPRAM memory for p_init_enet_pram.\",\n-\t\t\t     __FUNCTION__);\n+\t\t\t     __func__);\n \t\tucc_geth_memclean(ugeth);\n \t\treturn -ENOMEM;\n \t}\n@@ -3360,7 +3360,7 @@ static void ucc_geth_timeout(struct net_\n {\n \tstruct ucc_geth_private *ugeth = netdev_priv(dev);\n \n-\tugeth_vdbg(\"%s: IN\", __FUNCTION__);\n+\tugeth_vdbg(\"%s: IN\", __func__);\n \n \tdev->stats.tx_errors++;\n \n@@ -3386,7 +3386,7 @@ static int ucc_geth_start_xmit(struct sk\n \tu32 bd_status;\n \tu8 txQ = 0;\n \n-\tugeth_vdbg(\"%s: IN\", __FUNCTION__);\n+\tugeth_vdbg(\"%s: IN\", __func__);\n \n \tspin_lock_irq(&ugeth->lock);\n \n@@ -3459,7 +3459,7 @@ static int ucc_geth_rx(struct ucc_geth_p\n \tu8 *bdBuffer;\n \tstruct net_device *dev;\n \n-\tugeth_vdbg(\"%s: IN\", __FUNCTION__);\n+\tugeth_vdbg(\"%s: IN\", __func__);\n \n \tdev = ugeth->dev;\n \n@@ -3481,7 +3481,7 @@ static int ucc_geth_rx(struct ucc_geth_p\n \t\t    (bd_status & R_ERRORS_FATAL)) {\n \t\t\tif (netif_msg_rx_err(ugeth))\n \t\t\t\tugeth_err(\"%s, %d: ERROR!!! skb - 0x%08x\",\n-\t\t\t\t\t   __FUNCTION__, __LINE__, (u32) skb);\n+\t\t\t\t\t   __func__, __LINE__, (u32) skb);\n \t\t\tif (skb)\n \t\t\t\tdev_kfree_skb_any(skb);\n \n@@ -3507,7 +3507,7 @@ static int ucc_geth_rx(struct ucc_geth_p\n \t\tskb = get_new_skb(ugeth, bd);\n \t\tif (!skb) {\n \t\t\tif (netif_msg_rx_err(ugeth))\n-\t\t\t\tugeth_warn(\"%s: No Rx Data Buffer\", __FUNCTION__);\n+\t\t\t\tugeth_warn(\"%s: No Rx Data Buffer\", __func__);\n \t\t\tdev->stats.rx_dropped++;\n \t\t\tbreak;\n \t\t}\n@@ -3613,7 +3613,7 @@ static irqreturn_t ucc_geth_irq_handler(\n \tregister u32 tx_mask;\n \tu8 i;\n \n-\tugeth_vdbg(\"%s: IN\", __FUNCTION__);\n+\tugeth_vdbg(\"%s: IN\", __func__);\n \n \tuccf = ugeth->uccf;\n \tug_info = ugeth->ug_info;\n@@ -3683,13 +3683,13 @@ static int ucc_geth_open(struct net_devi\n \tstruct ucc_geth_private *ugeth = netdev_priv(dev);\n \tint err;\n \n-\tugeth_vdbg(\"%s: IN\", __FUNCTION__);\n+\tugeth_vdbg(\"%s: IN\", __func__);\n \n \t/* Test station address */\n \tif (dev->dev_addr[0] & ENET_GROUP_ADDR) {\n \t\tif (netif_msg_ifup(ugeth))\n \t\t\tugeth_err(\"%s: Multicast address used for station address\"\n-\t\t\t\t  \" - is this what you wanted?\", __FUNCTION__);\n+\t\t\t\t  \" - is this what you wanted?\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -3772,7 +3772,7 @@ static int ucc_geth_close(struct net_dev\n {\n \tstruct ucc_geth_private *ugeth = netdev_priv(dev);\n \n-\tugeth_vdbg(\"%s: IN\", __FUNCTION__);\n+\tugeth_vdbg(\"%s: IN\", __func__);\n \n \tnapi_disable(&ugeth->napi);\n \n@@ -3840,7 +3840,7 @@ static int ucc_geth_probe(struct of_devi\n \t\tPHY_INTERFACE_MODE_TBI, PHY_INTERFACE_MODE_RTBI,\n \t};\n \n-\tugeth_vdbg(\"%s: IN\", __FUNCTION__);\n+\tugeth_vdbg(\"%s: IN\", __func__);\n \n \tprop = of_get_property(np, \"cell-index\", NULL);\n \tif (!prop) {\n@@ -3857,7 +3857,7 @@ static int ucc_geth_probe(struct of_devi\n \tif (ug_info == NULL) {\n \t\tif (netif_msg_probe(&debug))\n \t\t\tugeth_err(\"%s: [%d] Missing additional data!\",\n-\t\t\t\t       \t__FUNCTION__, ucc_num);\n+\t\t\t\t       \t__func__, ucc_num);\n \t\treturn -ENODEV;\n \t}\n \ndiff -puN drivers/net/usb/mcs7830.c~drivers-net-replace-__function__-with-__func__ drivers/net/usb/mcs7830.c\n--- a/drivers/net/usb/mcs7830.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/usb/mcs7830.c\n@@ -118,7 +118,7 @@ static void mcs7830_async_cmd_callback(s\n \n \tif (urb->status < 0)\n \t\tprintk(KERN_DEBUG \"%s() failed with %d\\n\",\n-\t\t       __FUNCTION__, urb->status);\n+\t\t       __func__, urb->status);\n \n \tkfree(req);\n \tusb_free_urb(urb);\ndiff -puN drivers/net/usb/pegasus.c~drivers-net-replace-__function__-with-__func__ drivers/net/usb/pegasus.c\n--- a/drivers/net/usb/pegasus.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/usb/pegasus.c\n@@ -119,7 +119,7 @@ static void ctrl_callback(struct urb *ur\n \tdefault:\n \t\tif (netif_msg_drv(pegasus) && printk_ratelimit())\n \t\t\tdev_dbg(&pegasus->intf->dev, \"%s, status %d\\n\",\n-\t\t\t\t__FUNCTION__, urb->status);\n+\t\t\t\t__func__, urb->status);\n \t}\n \tpegasus->flags &= ~ETH_REGS_CHANGED;\n \twake_up(&pegasus->ctrl_wait);\n@@ -136,7 +136,7 @@ static int get_registers(pegasus_t * peg\n \tif (!buffer) {\n \t\tif (netif_msg_drv(pegasus))\n \t\t\tdev_warn(&pegasus->intf->dev, \"out of memory in %s\\n\",\n-\t\t\t\t\t__FUNCTION__);\n+\t\t\t\t\t__func__);\n \t\treturn -ENOMEM;\n \t}\n \tadd_wait_queue(&pegasus->ctrl_wait, &wait);\n@@ -168,7 +168,7 @@ static int get_registers(pegasus_t * peg\n \t\t\tnetif_device_detach(pegasus->net);\n \t\tif (netif_msg_drv(pegasus) && printk_ratelimit())\n \t\t\tdev_err(&pegasus->intf->dev, \"%s, status %d\\n\",\n-\t\t\t\t\t__FUNCTION__, ret);\n+\t\t\t\t\t__func__, ret);\n \t\tgoto out;\n \t}\n \n@@ -192,7 +192,7 @@ static int set_registers(pegasus_t * peg\n \tif (!buffer) {\n \t\tif (netif_msg_drv(pegasus))\n \t\t\tdev_warn(&pegasus->intf->dev, \"out of memory in %s\\n\",\n-\t\t\t\t\t__FUNCTION__);\n+\t\t\t\t\t__func__);\n \t\treturn -ENOMEM;\n \t}\n \tmemcpy(buffer, data, size);\n@@ -224,7 +224,7 @@ static int set_registers(pegasus_t * peg\n \t\t\tnetif_device_detach(pegasus->net);\n \t\tif (netif_msg_drv(pegasus))\n \t\t\tdev_err(&pegasus->intf->dev, \"%s, status %d\\n\",\n-\t\t\t\t\t__FUNCTION__, ret);\n+\t\t\t\t\t__func__, ret);\n \t\tgoto out;\n \t}\n \n@@ -246,7 +246,7 @@ static int set_register(pegasus_t * pega\n \tif (!tmp) {\n \t\tif (netif_msg_drv(pegasus))\n \t\t\tdev_warn(&pegasus->intf->dev, \"out of memory in %s\\n\",\n-\t\t\t\t\t__FUNCTION__);\n+\t\t\t\t\t__func__);\n \t\treturn -ENOMEM;\n \t}\n \tmemcpy(tmp, &data, 1);\n@@ -277,7 +277,7 @@ static int set_register(pegasus_t * pega\n \t\t\tnetif_device_detach(pegasus->net);\n \t\tif (netif_msg_drv(pegasus) && printk_ratelimit())\n \t\t\tdev_err(&pegasus->intf->dev, \"%s, status %d\\n\",\n-\t\t\t\t\t__FUNCTION__, ret);\n+\t\t\t\t\t__func__, ret);\n \t\tgoto out;\n \t}\n \n@@ -310,7 +310,7 @@ static int update_eth_regs_async(pegasus\n \t\t\tnetif_device_detach(pegasus->net);\n \t\tif (netif_msg_drv(pegasus))\n \t\t\tdev_err(&pegasus->intf->dev, \"%s, status %d\\n\",\n-\t\t\t\t\t__FUNCTION__, ret);\n+\t\t\t\t\t__func__, ret);\n \t}\n \n \treturn ret;\n@@ -341,7 +341,7 @@ static int read_mii_word(pegasus_t * peg\n \t}\n fail:\n \tif (netif_msg_drv(pegasus))\n-\t\tdev_warn(&pegasus->intf->dev, \"%s failed\\n\", __FUNCTION__);\n+\t\tdev_warn(&pegasus->intf->dev, \"%s failed\\n\", __func__);\n \n \treturn ret;\n }\n@@ -378,7 +378,7 @@ static int write_mii_word(pegasus_t * pe\n \n fail:\n \tif (netif_msg_drv(pegasus))\n-\t\tdev_warn(&pegasus->intf->dev, \"%s failed\\n\", __FUNCTION__);\n+\t\tdev_warn(&pegasus->intf->dev, \"%s failed\\n\", __func__);\n \treturn -ETIMEDOUT;\n }\n \n@@ -415,7 +415,7 @@ static int read_eprom_word(pegasus_t * p\n \n fail:\n \tif (netif_msg_drv(pegasus))\n-\t\tdev_warn(&pegasus->intf->dev, \"%s failed\\n\", __FUNCTION__);\n+\t\tdev_warn(&pegasus->intf->dev, \"%s failed\\n\", __func__);\n \treturn -ETIMEDOUT;\n }\n \n@@ -463,7 +463,7 @@ static int write_eprom_word(pegasus_t * \n \t\treturn ret;\n fail:\n \tif (netif_msg_drv(pegasus))\n-\t\tdev_warn(&pegasus->intf->dev, \"%s failed\\n\", __FUNCTION__);\n+\t\tdev_warn(&pegasus->intf->dev, \"%s failed\\n\", __func__);\n \treturn -ETIMEDOUT;\n }\n #endif\t\t\t\t/* PEGASUS_WRITE_EEPROM */\ndiff -puN drivers/net/via-velocity.h~drivers-net-replace-__function__-with-__func__ drivers/net/via-velocity.h\n--- a/drivers/net/via-velocity.h~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/via-velocity.h\n@@ -1381,7 +1381,7 @@ enum velocity_msg_level {\n #define ASSERT(x) { \\\n \tif (!(x)) { \\\n \t\tprintk(KERN_ERR \"assertion %s failed: file %s line %d\\n\", #x,\\\n-\t\t\t__FUNCTION__, __LINE__);\\\n+\t\t\t__func__, __LINE__);\\\n \t\tBUG(); \\\n \t}\\\n }\ndiff -puN drivers/net/wan/cycx_drv.c~drivers-net-replace-__function__-with-__func__ drivers/net/wan/cycx_drv.c\n--- a/drivers/net/wan/cycx_drv.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/wan/cycx_drv.c\n@@ -407,7 +407,7 @@ static int load_cyc2x(struct cycx_hw *hw\n \tif (cfm->version != CFM_VERSION) {\n \t\tprintk(KERN_ERR \"%s:%s: firmware format %u rejected! \"\n \t\t\t\t\"Expecting %u.\\n\",\n-\t\t\t\tmodname, __FUNCTION__, cfm->version, CFM_VERSION);\n+\t\t\t\tmodname, __func__, cfm->version, CFM_VERSION);\n \t\treturn -EINVAL;\n \t}\n \n@@ -420,7 +420,7 @@ static int load_cyc2x(struct cycx_hw *hw\n */\n \tif (cksum != cfm->checksum) {\n \t\tprintk(KERN_ERR \"%s:%s: firmware corrupted!\\n\",\n-\t\t\t\tmodname, __FUNCTION__);\n+\t\t\t\tmodname, __func__);\n \t\tprintk(KERN_ERR \" cdsize = 0x%x (expected 0x%lx)\\n\",\n \t\t\t\tlen - (int)sizeof(struct cycx_firmware) - 1,\n \t\t\t\tcfm->info.codesize);\n@@ -432,7 +432,7 @@ static int load_cyc2x(struct cycx_hw *hw\n \t/* If everything is ok, set reset, data and code pointers */\n \timg_hdr = (struct cycx_fw_header *)&cfm->image;\n #ifdef FIRMWARE_DEBUG\n-\tprintk(KERN_INFO \"%s:%s: image sizes\\n\", __FUNCTION__, modname);\n+\tprintk(KERN_INFO \"%s:%s: image sizes\\n\", __func__, modname);\n \tprintk(KERN_INFO \" reset=%lu\\n\", img_hdr->reset_size);\n \tprintk(KERN_INFO \"  data=%lu\\n\", img_hdr->data_size);\n \tprintk(KERN_INFO \"  code=%lu\\n\", img_hdr->code_size);\ndiff -puN drivers/net/wan/cycx_x25.c~drivers-net-replace-__function__-with-__func__ drivers/net/wan/cycx_x25.c\n--- a/drivers/net/wan/cycx_x25.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/wan/cycx_x25.c\n@@ -874,7 +874,7 @@ static void cycx_x25_irq_connect(struct \n \t\tnibble_to_byte(d + (sizeloc >> 1), rem, sizerem, sizeloc & 1);\n \n \tdprintk(1, KERN_INFO \"%s:lcn=%d, local=%s, remote=%s\\n\",\n-\t\t\t  __FUNCTION__, lcn, loc, rem);\n+\t\t\t  __func__, lcn, loc, rem);\n \n \tdev = cycx_x25_get_dev_by_dte_addr(wandev, rem);\n \tif (!dev) {\n@@ -902,7 +902,7 @@ static void cycx_x25_irq_connect_confirm\n \tcycx_peek(&card->hw, cmd->buf, &lcn, sizeof(lcn));\n \tcycx_peek(&card->hw, cmd->buf + 1, &key, sizeof(key));\n \tdprintk(1, KERN_INFO \"%s: %s:lcn=%d, key=%d\\n\",\n-\t\t\t  card->devname, __FUNCTION__, lcn, key);\n+\t\t\t  card->devname, __func__, lcn, key);\n \n \tdev = cycx_x25_get_dev_by_lcn(wandev, -key);\n \tif (!dev) {\n@@ -929,7 +929,7 @@ static void cycx_x25_irq_disconnect_conf\n \n \tcycx_peek(&card->hw, cmd->buf, &lcn, sizeof(lcn));\n \tdprintk(1, KERN_INFO \"%s: %s:lcn=%d\\n\",\n-\t\t\t  card->devname, __FUNCTION__, lcn);\n+\t\t\t  card->devname, __func__, lcn);\n \tdev = cycx_x25_get_dev_by_lcn(wandev, lcn);\n \tif (!dev) {\n \t\t/* Invalid channel, discard packet */\n@@ -950,7 +950,7 @@ static void cycx_x25_irq_disconnect(stru\n \tu8 lcn;\n \n \tcycx_peek(&card->hw, cmd->buf, &lcn, sizeof(lcn));\n-\tdprintk(1, KERN_INFO \"%s:lcn=%d\\n\", __FUNCTION__, lcn);\n+\tdprintk(1, KERN_INFO \"%s:lcn=%d\\n\", __func__, lcn);\n \n \tdev = cycx_x25_get_dev_by_lcn(wandev, lcn);\n \tif (dev) {\n@@ -1381,7 +1381,7 @@ static void cycx_x25_chan_timer(unsigned\n \t\tcycx_x25_chan_disconnect(dev);\n \telse\n \t\tprintk(KERN_ERR \"%s: %s for svc (%s) not connected!\\n\",\n-\t\t\t\tchan->card->devname, __FUNCTION__, dev->name);\n+\t\t\t\tchan->card->devname, __func__, dev->name);\n }\n \n /* Set logical channel state. */\n@@ -1485,7 +1485,7 @@ static void cycx_x25_chan_send_event(str\n \tunsigned char *ptr;\n \n \tif ((skb = dev_alloc_skb(1)) == NULL) {\n-\t\tprintk(KERN_ERR \"%s: out of memory\\n\", __FUNCTION__);\n+\t\tprintk(KERN_ERR \"%s: out of memory\\n\", __func__);\n \t\treturn;\n \t}\n \ndiff -puN drivers/net/wan/dscc4.c~drivers-net-replace-__function__-with-__func__ drivers/net/wan/dscc4.c\n--- a/drivers/net/wan/dscc4.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/wan/dscc4.c\n@@ -647,7 +647,7 @@ static inline void dscc4_rx_skb(struct d\n \n \tskb = dpriv->rx_skbuff[dpriv->rx_current++%RX_RING_SIZE];\n \tif (!skb) {\n-\t\tprintk(KERN_DEBUG \"%s: skb=0 (%s)\\n\", dev->name, __FUNCTION__);\n+\t\tprintk(KERN_DEBUG \"%s: skb=0 (%s)\\n\", dev->name, __func__);\n \t\tgoto refill;\n \t}\n \tpkt_len = TO_SIZE(le32_to_cpu(rx_fd->state2));\ndiff -puN drivers/net/wan/pc300_tty.c~drivers-net-replace-__function__-with-__func__ drivers/net/wan/pc300_tty.c\n--- a/drivers/net/wan/pc300_tty.c~drivers-net-replace-__function__-with-__func__\n+++ a/drivers/net/wan/pc300_tty.c\n@@ -548,7 +548,7 @@ static int pc300_tiocmset(struct tty_str\n {\n \tst_cpc_tty_area    *cpc_tty; \n \n-\tCPC_TTY_DBG(\"%s: set:%x clear:%x\\n\", __FUNCTION__, set, clear);\n+\tCPC_TTY_DBG(\"%s: set:%x clear:%x\\n\", __func__, set, clear);\n \n \tif (!tty || !tty->driver_data ) {\n \t   \tCPC_TTY_DBG(\"hdlcX-tty: no TTY to chars in buffer\\n\");\t\n",
    "prefixes": [
        "07/21"
    ]
}