Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60cb1e20 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: fix checkpatch warning 



Fix warning founded by checkpatch.pl.
WARNING: __func__ should be used instead of gcc specific __FUNCTION__

Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9eac3a15

drivers/staging/wilc1000/linux_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

				}

drivers/staging/wilc1000/linux_wlan_common.h

+8 −8
Original line number Diff line number Diff line
@@ -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

drivers/staging/wilc1000/wilc_platform.h

+1 −1
Original line number Diff line number Diff line
@@ -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