summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 c46f088..b352c50 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)
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(&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
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
OpenPOWER on IntegriCloud