]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: wilc1000: fix checkpatch warning
authorChaehyun Lim <chaehyun.lim@gmail.com>
Fri, 19 Jun 2015 00:06:28 +0000 (09:06 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Jun 2015 03:20:58 +0000 (20:20 -0700)
Fix warning founded by checkpatch.pl.
WARNING: __func__ should be used instead of gcc specific __FUNCTION__

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/linux_wlan.c
drivers/staging/wilc1000/linux_wlan_common.h
drivers/staging/wilc1000/wilc_platform.h

index c46f088656d295cef20a2849cfaa47b872de95b1..b352c504a77d273d23712addeaca6ae79013451a 100644 (file)
@@ -2403,7 +2403,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;
                                }
index 830d96a1f84ecc1e3c908bdc40ff9f3a793cf719..2476bfda1b4684cc739401c8afdeba9ba66197f9 100644 (file)
@@ -54,7 +54,7 @@ extern atomic_t DEBUG_LEVEL;
        do {                                                            \
                if ((atomic_read(&DEBUG_LEVEL) & DEBUG) &&              \
                   ((atomic_read(&REGION)) & (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(&REGION)) & (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(&REGION)) & (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
index 7ddea8336af69792633d51eda8ba26f338eda17a..d03532cc3af21d09dd6242601dfb43b8679733c8 100644 (file)
@@ -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