From patchwork Fri Jun 19 00:06:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 6641841 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 71F369F326 for ; Fri, 19 Jun 2015 00:06:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5EEDD208D5 for ; Fri, 19 Jun 2015 00:06:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 65576208CA for ; Fri, 19 Jun 2015 00:06:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752494AbbFSAGh (ORCPT ); Thu, 18 Jun 2015 20:06:37 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:34732 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751734AbbFSAGh (ORCPT ); Thu, 18 Jun 2015 20:06:37 -0400 Received: by pdbki1 with SMTP id ki1so77193807pdb.1 for ; Thu, 18 Jun 2015 17:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=f98CwdDBqIqbSGrEfs5Kw8LIjaqojnjNJb5kVvhGpFQ=; b=Msije3zlMWnULOItzJLQtp59L8+NQAaSRADn331c0SmuQ9322n3tZSn2Mg10JGg8nu +EmhmoLDkm4lZl8Yu+p7VY5KefHpWkUhMLbuyEjXERiep3bKHp6WoiHnu8LxVwPnBe6y sG2R2Lo4KnTRyF5X4k+epwHcFQQcndyDjZ3J3fHADRg0V29I4ldJI1wmmsiABPaZdnPI hVYA4wwGSxHP07K2mFg6+06380teB+kBOt3C6OVy1G1NgfVcGA62Qh3OLzqQMGe7FEtm H9Xk8B4AoAgdDcuQoTXtMXNf1HPl0L5MJHeW46zflHytQlT4MI4DYIhXVZwNN6tM6Z8C L9EA== X-Received: by 10.66.161.102 with SMTP id xr6mr26183371pab.8.1434672396633; Thu, 18 Jun 2015 17:06:36 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by mx.google.com with ESMTPSA id y1sm9227169pdy.2.2015.06.18.17.06.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jun 2015 17:06:35 -0700 (PDT) From: Chaehyun Lim To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, rachel.kim@atmel.com, dean.lee@atmel.com, chris.park@atmel.com, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, Chaehyun Lim Subject: [PATCH] staging: wilc1000: fix checkpatch warning Date: Fri, 19 Jun 2015 09:06:28 +0900 Message-Id: <1434672388-4074-1-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix warning founded by checkpatch.pl. WARNING: __func__ should be used instead of gcc specific __FUNCTION__ Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/linux_wlan.c | 2 +- drivers/staging/wilc1000/linux_wlan_common.h | 16 ++++++++-------- drivers/staging/wilc1000/wilc_platform.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 8ecbb2d..fb875c2 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -2425,7 +2425,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) snprintf(buff, size, "rssi %d", rssi); if (copy_to_user(wrq->u.data.pointer, buff, size)) { - PRINT_ER("%s: failed to copy data to user buffer\n", __FUNCTION__); + PRINT_ER("%s: failed to copy data to user buffer\n", __func__); s32Error = -EFAULT; goto done; } diff --git a/drivers/staging/wilc1000/linux_wlan_common.h b/drivers/staging/wilc1000/linux_wlan_common.h index 830d96a..2476bfd 100644 --- a/drivers/staging/wilc1000/linux_wlan_common.h +++ b/drivers/staging/wilc1000/linux_wlan_common.h @@ -54,7 +54,7 @@ extern atomic_t DEBUG_LEVEL; do { \ if ((atomic_read(&DEBUG_LEVEL) & DEBUG) && \ ((atomic_read(®ION)) & (region))) { \ - printk("DBG [%s: %d]", __FUNCTION__, __LINE__); \ + printk("DBG [%s: %d]", __func__, __LINE__); \ printk(__VA_ARGS__); \ } \ } while (0) @@ -63,7 +63,7 @@ extern atomic_t DEBUG_LEVEL; do { \ if ((atomic_read(&DEBUG_LEVEL) & INFO) && \ ((atomic_read(®ION)) & (region))) { \ - printk("INFO [%s]", __FUNCTION__); \ + printk("INFO [%s]", __func__); \ printk(__VA_ARGS__); \ } \ } while (0) @@ -72,7 +72,7 @@ extern atomic_t DEBUG_LEVEL; do { \ if ((atomic_read(&DEBUG_LEVEL) & WRN) && \ ((atomic_read(®ION)) & (region))) { \ - printk("WRN [%s: %d]", __FUNCTION__, __LINE__); \ + printk("WRN [%s: %d]", __func__, __LINE__); \ printk(__VA_ARGS__); \ } \ } while (0) @@ -80,7 +80,7 @@ extern atomic_t DEBUG_LEVEL; #define PRINT_ER(...) \ do { \ if ((atomic_read(&DEBUG_LEVEL) & ERR)) { \ - printk("ERR [%s: %d]", __FUNCTION__, __LINE__); \ + printk("ERR [%s: %d]", __func__, __LINE__); \ printk(__VA_ARGS__); \ } \ } while (0) @@ -96,7 +96,7 @@ extern atomic_t DEBUG_LEVEL; #define PRINT_D(region, ...) \ do { \ if (DEBUG == 1 && ((REGION)&(region))) { \ - printk("DBG [%s: %d]", __FUNCTION__, __LINE__); \ + printk("DBG [%s: %d]", __func__, __LINE__); \ printk(__VA_ARGS__); \ } \ } while (0) @@ -104,7 +104,7 @@ extern atomic_t DEBUG_LEVEL; #define PRINT_INFO(region, ...) \ do { \ if (INFO == 1 && ((REGION)&(region))) { \ - printk("INFO [%s]", __FUNCTION__); \ + printk("INFO [%s]", __func__); \ printk(__VA_ARGS__); \ } \ } while (0) @@ -112,14 +112,14 @@ extern atomic_t DEBUG_LEVEL; #define PRINT_WRN(region, ...) \ do { \ if (WRN == 1 && ((REGION)&(region))) { \ - printk("WRN [%s: %d]", __FUNCTION__, __LINE__); \ + printk("WRN [%s: %d]", __func__, __LINE__); \ printk(__VA_ARGS__); \ } \ } while (0) #define PRINT_ER(...) \ do { \ - printk("ERR [%s: %d]", __FUNCTION__, __LINE__); \ + printk("ERR [%s: %d]", __func__, __LINE__); \ printk(__VA_ARGS__); \ } while (0) #endif diff --git a/drivers/staging/wilc1000/wilc_platform.h b/drivers/staging/wilc1000/wilc_platform.h index 7ddea83..d03532c 100644 --- a/drivers/staging/wilc1000/wilc_platform.h +++ b/drivers/staging/wilc1000/wilc_platform.h @@ -47,6 +47,6 @@ typedef time_t WILC_Time; /* Generic printf function */ #define __WILC_FILE__ __FILE__ -#define __WILC_FUNCTION__ __FUNCTION__ +#define __WILC_FUNCTION__ __func__ #define __WILC_LINE__ __LINE__ #endif