aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorChaehyun Lim <chaehyun.lim@gmail.com>2015-06-18 20:06:28 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-18 23:20:58 -0400
commit60cb1e20c4732c2704d7a5a2b9fd291b6b548671 (patch)
tree5e1bc50970fb26b16f58bbd3b0c9c2716aa983a8 /drivers/staging
parent9eac3a158957f98da59af51542753365986c898f (diff)
staging: wilc1000: fix checkpatch warning
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/wilc1000/linux_wlan.c2
-rw-r--r--drivers/staging/wilc1000/linux_wlan_common.h16
-rw-r--r--drivers/staging/wilc1000/wilc_platform.h2
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index c46f088656d2..b352c504a77d 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -2403,7 +2403,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
2403 snprintf(buff, size, "rssi %d", rssi); 2403 snprintf(buff, size, "rssi %d", rssi);
2404 2404
2405 if (copy_to_user(wrq->u.data.pointer, buff, size)) { 2405 if (copy_to_user(wrq->u.data.pointer, buff, size)) {
2406 PRINT_ER("%s: failed to copy data to user buffer\n", __FUNCTION__); 2406 PRINT_ER("%s: failed to copy data to user buffer\n", __func__);
2407 s32Error = -EFAULT; 2407 s32Error = -EFAULT;
2408 goto done; 2408 goto done;
2409 } 2409 }
diff --git a/drivers/staging/wilc1000/linux_wlan_common.h b/drivers/staging/wilc1000/linux_wlan_common.h
index 830d96a1f84e..2476bfda1b46 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;
54 do { \ 54 do { \
55 if ((atomic_read(&DEBUG_LEVEL) & DEBUG) && \ 55 if ((atomic_read(&DEBUG_LEVEL) & DEBUG) && \
56 ((atomic_read(&REGION)) & (region))) { \ 56 ((atomic_read(&REGION)) & (region))) { \
57 printk("DBG [%s: %d]", __FUNCTION__, __LINE__); \ 57 printk("DBG [%s: %d]", __func__, __LINE__); \
58 printk(__VA_ARGS__); \ 58 printk(__VA_ARGS__); \
59 } \ 59 } \
60 } while (0) 60 } while (0)
@@ -63,7 +63,7 @@ extern atomic_t DEBUG_LEVEL;
63 do { \ 63 do { \
64 if ((atomic_read(&DEBUG_LEVEL) & INFO) && \ 64 if ((atomic_read(&DEBUG_LEVEL) & INFO) && \
65 ((atomic_read(&REGION)) & (region))) { \ 65 ((atomic_read(&REGION)) & (region))) { \
66 printk("INFO [%s]", __FUNCTION__); \ 66 printk("INFO [%s]", __func__); \
67 printk(__VA_ARGS__); \ 67 printk(__VA_ARGS__); \
68 } \ 68 } \
69 } while (0) 69 } while (0)
@@ -72,7 +72,7 @@ extern atomic_t DEBUG_LEVEL;
72 do { \ 72 do { \
73 if ((atomic_read(&DEBUG_LEVEL) & WRN) && \ 73 if ((atomic_read(&DEBUG_LEVEL) & WRN) && \
74 ((atomic_read(&REGION)) & (region))) { \ 74 ((atomic_read(&REGION)) & (region))) { \
75 printk("WRN [%s: %d]", __FUNCTION__, __LINE__); \ 75 printk("WRN [%s: %d]", __func__, __LINE__); \
76 printk(__VA_ARGS__); \ 76 printk(__VA_ARGS__); \
77 } \ 77 } \
78 } while (0) 78 } while (0)
@@ -80,7 +80,7 @@ extern atomic_t DEBUG_LEVEL;
80#define PRINT_ER(...) \ 80#define PRINT_ER(...) \
81 do { \ 81 do { \
82 if ((atomic_read(&DEBUG_LEVEL) & ERR)) { \ 82 if ((atomic_read(&DEBUG_LEVEL) & ERR)) { \
83 printk("ERR [%s: %d]", __FUNCTION__, __LINE__); \ 83 printk("ERR [%s: %d]", __func__, __LINE__); \
84 printk(__VA_ARGS__); \ 84 printk(__VA_ARGS__); \
85 } \ 85 } \
86 } while (0) 86 } while (0)
@@ -96,7 +96,7 @@ extern atomic_t DEBUG_LEVEL;
96#define PRINT_D(region, ...) \ 96#define PRINT_D(region, ...) \
97 do { \ 97 do { \
98 if (DEBUG == 1 && ((REGION)&(region))) { \ 98 if (DEBUG == 1 && ((REGION)&(region))) { \
99 printk("DBG [%s: %d]", __FUNCTION__, __LINE__); \ 99 printk("DBG [%s: %d]", __func__, __LINE__); \
100 printk(__VA_ARGS__); \ 100 printk(__VA_ARGS__); \
101 } \ 101 } \
102 } while (0) 102 } while (0)
@@ -104,7 +104,7 @@ extern atomic_t DEBUG_LEVEL;
104#define PRINT_INFO(region, ...) \ 104#define PRINT_INFO(region, ...) \
105 do { \ 105 do { \
106 if (INFO == 1 && ((REGION)&(region))) { \ 106 if (INFO == 1 && ((REGION)&(region))) { \
107 printk("INFO [%s]", __FUNCTION__); \ 107 printk("INFO [%s]", __func__); \
108 printk(__VA_ARGS__); \ 108 printk(__VA_ARGS__); \
109 } \ 109 } \
110 } while (0) 110 } while (0)
@@ -112,14 +112,14 @@ extern atomic_t DEBUG_LEVEL;
112#define PRINT_WRN(region, ...) \ 112#define PRINT_WRN(region, ...) \
113 do { \ 113 do { \
114 if (WRN == 1 && ((REGION)&(region))) { \ 114 if (WRN == 1 && ((REGION)&(region))) { \
115 printk("WRN [%s: %d]", __FUNCTION__, __LINE__); \ 115 printk("WRN [%s: %d]", __func__, __LINE__); \
116 printk(__VA_ARGS__); \ 116 printk(__VA_ARGS__); \
117 } \ 117 } \
118 } while (0) 118 } while (0)
119 119
120#define PRINT_ER(...) \ 120#define PRINT_ER(...) \
121 do { \ 121 do { \
122 printk("ERR [%s: %d]", __FUNCTION__, __LINE__); \ 122 printk("ERR [%s: %d]", __func__, __LINE__); \
123 printk(__VA_ARGS__); \ 123 printk(__VA_ARGS__); \
124 } while (0) 124 } while (0)
125#endif 125#endif
diff --git a/drivers/staging/wilc1000/wilc_platform.h b/drivers/staging/wilc1000/wilc_platform.h
index 7ddea8336af6..d03532cc3af2 100644
--- a/drivers/staging/wilc1000/wilc_platform.h
+++ b/drivers/staging/wilc1000/wilc_platform.h
@@ -47,6 +47,6 @@ typedef time_t WILC_Time;
47 47
48/* Generic printf function */ 48/* Generic printf function */
49#define __WILC_FILE__ __FILE__ 49#define __WILC_FILE__ __FILE__
50#define __WILC_FUNCTION__ __FUNCTION__ 50#define __WILC_FUNCTION__ __func__
51#define __WILC_LINE__ __LINE__ 51#define __WILC_LINE__ __LINE__
52#endif 52#endif
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-24 20:14:19 -0500