Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: wilc1000: fix checkpatch warning

Browse Source 
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>
This commit is contained in:
Chaehyun Lim 2015-06-19 09:06:28 +09:00 committed by Greg Kroah-Hartman
parent 9eac3a1589
commit 60cb1e20c4
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/wilc1000/linux_wlan.c
View 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;
}

16
drivers/staging/wilc1000/linux_wlan_common.h
View 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

2
drivers/staging/wilc1000/wilc_platform.h
View 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