Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1208679 > unrolled thread

[PATCH 4/5] staging: wilc1000: use pr_* instead of printk

Started byRaphaël Beamonte <raphael.beamonte@gmail.com>
First post2015-08-17 18:10 +0200
Last post2015-08-17 20:10 +0200
Articles 4 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 4/5] staging: wilc1000: use pr_* instead of printk Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-08-17 18:10 +0200
    Re: [PATCH 4/5] staging: wilc1000: use pr_* instead of printk Dan Carpenter <dan.carpenter@oracle.com> - 2015-08-17 19:50 +0200
      Re: [PATCH 4/5] staging: wilc1000: use pr_* instead of printk Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-08-17 20:10 +0200
        Re: [PATCH 4/5] staging: wilc1000: use pr_* instead of printk Dan Carpenter <dan.carpenter@oracle.com> - 2015-08-17 20:10 +0200

#1208679 — [PATCH 4/5] staging: wilc1000: use pr_* instead of printk

FromRaphaël Beamonte <raphael.beamonte@gmail.com>
Date2015-08-17 18:10 +0200
Subject[PATCH 4/5] staging: wilc1000: use pr_* instead of printk
Message-ID<pYv90-3OC-11@gated-at.bofh.it>
Signed-off-by: Raphaël Beamonte <raphael.beamonte@gmail.com>
---
 drivers/staging/wilc1000/coreconfigurator.c  |  4 ++--
 drivers/staging/wilc1000/linux_wlan.c        |  8 +++----
 drivers/staging/wilc1000/linux_wlan_common.h | 32 ++++++++++++++--------------
 drivers/staging/wilc1000/linux_wlan_sdio.c   |  2 +-
 drivers/staging/wilc1000/linux_wlan_spi.c    |  2 +-
 drivers/staging/wilc1000/wilc_debugfs.c      | 16 +++++++-------
 drivers/staging/wilc1000/wilc_exported_buf.c |  6 +++---
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index c81c41d..0cbf4a9c 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -2007,7 +2007,7 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
 							pstrWIDs[counter].u16WIDid,
 							(counter == u32WIDsCount - 1), drvHandler)) {
 				ret = -1;
-				printk("[Sendconfigpkt]Get Timed out\n");
+				pr_debug("[Sendconfigpkt]Get Timed out\n");
 				break;
 			}
 		}
@@ -2029,7 +2029,7 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
 							pstrWIDs[counter].s32ValueSize,
 							(counter == u32WIDsCount - 1), drvHandler)) {
 				ret = -1;
-				printk("[Sendconfigpkt]Set Timed out\n");
+				pr_debug("[Sendconfigpkt]Set Timed out\n");
 				break;
 			}
 		}
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 040e55d..1f32c36 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1306,7 +1306,7 @@ void wilc1000_wlan_deinit(linux_wlan_t *nic)
 
 	if (g_linux_wlan->wilc1000_initialized)	{
 
-		printk("Deinitializing wilc1000  ...\n");
+		pr_info("Deinitializing wilc1000  ...\n");
 
 		if (nic == NULL) {
 			PRINT_ER("nic is NULL\n");
@@ -2565,8 +2565,8 @@ static int __init init_wilc_driver(void)
 	}
 #endif
 
-	printk("IN INIT FUNCTION\n");
-	printk("*** WILC1000 driver VERSION=[10.2] FW_VER=[10.2] ***\n");
+	pr_info("IN INIT FUNCTION\n");
+	pr_info("*** WILC1000 driver VERSION=[10.2] FW_VER=[10.2] ***\n");
 
 	linux_wlan_device_power(1);
 	msleep(100);
@@ -2662,7 +2662,7 @@ static void __exit exit_wilc_driver(void)
 			kfree(g_linux_wlan);
 			g_linux_wlan = NULL;
 		}
-		printk("Module_exit Done.\n");
+		pr_info("Module_exit Done.\n");
 
 #if defined(WILC_DEBUGFS)
 		wilc_debugfs_remove();
diff --git a/drivers/staging/wilc1000/linux_wlan_common.h b/drivers/staging/wilc1000/linux_wlan_common.h
index e6ebf3e..14743ae 100644
--- a/drivers/staging/wilc1000/linux_wlan_common.h
+++ b/drivers/staging/wilc1000/linux_wlan_common.h
@@ -54,8 +54,8 @@ extern atomic_t DEBUG_LEVEL;
 	do {								\
 		if ((atomic_read(&DEBUG_LEVEL) & DEBUG) &&		\
 		   ((atomic_read(&REGION)) & (region))) {		\
-			printk("DBG [%s: %d]", __func__, __LINE__);	\
-			printk(__VA_ARGS__);				\
+			pr_debug("DBG [%s: %d]", __func__, __LINE__);	\
+			pr_debug(__VA_ARGS__);				\
 		}							\
 	} while (0)
 
@@ -63,8 +63,8 @@ extern atomic_t DEBUG_LEVEL;
 	do {								\
 		if ((atomic_read(&DEBUG_LEVEL) & INFO) &&		\
 		   ((atomic_read(&REGION)) & (region))) {		\
-			printk("INFO [%s]", __func__);			\
-			printk(__VA_ARGS__);				\
+			pr_info("INFO [%s]", __func__);			\
+			pr_info(__VA_ARGS__);				\
 		}							\
 	} while (0)
 
@@ -72,16 +72,16 @@ extern atomic_t DEBUG_LEVEL;
 	do {								\
 		if ((atomic_read(&DEBUG_LEVEL) & WRN) &&		\
 		   ((atomic_read(&REGION)) & (region))) {		\
-			printk("WRN [%s: %d]", __func__, __LINE__);	\
-			printk(__VA_ARGS__);				\
+			pr_warning("WRN [%s: %d]", __func__, __LINE__);	\
+			pr_warning(__VA_ARGS__);				\
 		}							\
 	} while (0)
 
 #define PRINT_ER(...)							\
 	do {								\
 		if ((atomic_read(&DEBUG_LEVEL) & ERR)) {		\
-			printk("ERR [%s: %d]", __func__, __LINE__);	\
-			printk(__VA_ARGS__);				\
+			pr_err("ERR [%s: %d]", __func__, __LINE__);	\
+			pr_err(__VA_ARGS__);				\
 		}							\
 	} while (0)
 
@@ -96,31 +96,31 @@ extern atomic_t DEBUG_LEVEL;
 #define PRINT_D(region, ...)						\
 	do {								\
 		if (DEBUG == 1 && ((REGION)&(region))) {		\
-			printk("DBG [%s: %d]", __func__, __LINE__);	\
-			printk(__VA_ARGS__);				\
+			pr_debug("DBG [%s: %d]", __func__, __LINE__);	\
+			pr_debug(__VA_ARGS__);				\
 		}							\
 	} while (0)
 
 #define PRINT_INFO(region, ...)						\
 	do {								\
 		if (INFO == 1 && ((REGION)&(region))) {			\
-			printk("INFO [%s]", __func__);			\
-			printk(__VA_ARGS__);				\
+			pr_info("INFO [%s]", __func__);			\
+			pr_info(__VA_ARGS__);				\
 		}							\
 	} while (0)
 
 #define PRINT_WRN(region, ...)						\
 	do {								\
 		if (WRN == 1 && ((REGION)&(region))) {			\
-			printk("WRN [%s: %d]", __func__, __LINE__);	\
-			printk(__VA_ARGS__);				\
+			pr_warning("WRN [%s: %d]", __func__, __LINE__);	\
+			pr_warning(__VA_ARGS__);				\
 		}							\
 	} while (0)
 
 #define PRINT_ER(...)							\
 	do {								\
-		printk("ERR [%s: %d]", __func__, __LINE__);		\
-		printk(__VA_ARGS__);					\
+		pr_err("ERR [%s: %d]", __func__, __LINE__);		\
+		pr_err(__VA_ARGS__);					\
 	} while (0)
 #endif
 
diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c b/drivers/staging/wilc1000/linux_wlan_sdio.c
index 37f31f4..13d7f84 100644
--- a/drivers/staging/wilc1000/linux_wlan_sdio.c
+++ b/drivers/staging/wilc1000/linux_wlan_sdio.c
@@ -136,7 +136,7 @@ static int linux_sdio_probe(struct sdio_func *func, const struct sdio_device_id
 		return -1;
 	}
 
-	printk("Driver Initializing success\n");
+	pr_info("Driver Initializing success\n");
 	return 0;
 }
 
diff --git a/drivers/staging/wilc1000/linux_wlan_spi.c b/drivers/staging/wilc1000/linux_wlan_spi.c
index 236669c..0bb68a5 100644
--- a/drivers/staging/wilc1000/linux_wlan_spi.c
+++ b/drivers/staging/wilc1000/linux_wlan_spi.c
@@ -50,7 +50,7 @@ static int __init wilc_bus_probe(struct spi_device *spi)
 	PRINT_D(BUS_DBG, "spiMax-Speed: %d\n", spi->max_speed_hz);
 	wilc_spi_dev = spi;
 
-	printk("Driver Initializing success\n");
+	pr_info("Driver Initializing success\n");
 	return 0;
 }
 
diff --git a/drivers/staging/wilc1000/wilc_debugfs.c b/drivers/staging/wilc1000/wilc_debugfs.c
index be2e901..588b167 100644
--- a/drivers/staging/wilc1000/wilc_debugfs.c
+++ b/drivers/staging/wilc1000/wilc_debugfs.c
@@ -68,16 +68,16 @@ static ssize_t wilc_debug_level_write(struct file *filp, const char *buf, size_t
 		flag = 100;
 
 	if (flag > DBG_LEVEL_ALL) {
-		printk("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(&DEBUG_LEVEL));
+		pr_err("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(&DEBUG_LEVEL));
 		return -EFAULT;
 	}
 
 	atomic_set(&DEBUG_LEVEL, (int)flag);
 
 	if (flag == 0)
-		printk("Debug-level disabled\n");
+		pr_info("Debug-level disabled\n");
 	else
-		printk("Debug-level enabled\n");
+		pr_info("Debug-level enabled\n");
 	return count;
 }
 
@@ -110,12 +110,12 @@ static ssize_t wilc_debug_region_write(struct file *filp, const char *buf, size_
 	flag = buffer[0] - '0';
 
 	if (flag > DBG_REGION_ALL) {
-		printk("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(&REGION));
+		pr_err("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(&REGION));
 		return -EFAULT;
 	}
 
 	atomic_set(&REGION, (int)flag);
-	printk("new debug-region is %x\n", atomic_read(&REGION));
+	pr_info("new debug-region is %x\n", atomic_read(&REGION));
 
 	return count;
 }
@@ -154,12 +154,12 @@ int wilc_debugfs_init(void)
 	wilc_dir = debugfs_create_dir("wilc_wifi", NULL);
 	if (wilc_dir ==  ERR_PTR(-ENODEV)) {
 		/* it's not error. the debugfs is just not being enabled. */
-		printk("ERR, kernel has built without debugfs support\n");
+		pr_err("kernel has built without debugfs support\n");
 		return 0;
 	}
 
 	if (!wilc_dir) {
-		printk("ERR, debugfs create dir\n");
+		pr_err("debugfs create dir\n");
 		return -1;
 	}
 
@@ -172,7 +172,7 @@ int wilc_debugfs_init(void)
 						    &info->fops);
 
 		if (!debugfs_files) {
-			printk("ERR fail to create the debugfs file, %s\n", info->name);
+			pr_err("fail to create the debugfs file, %s\n", info->name);
 			debugfs_remove_recursive(wilc_dir);
 			return -1;
 		}
diff --git a/drivers/staging/wilc1000/wilc_exported_buf.c b/drivers/staging/wilc1000/wilc_exported_buf.c
index c3aff9a..ceacfe2 100644
--- a/drivers/staging/wilc1000/wilc_exported_buf.c
+++ b/drivers/staging/wilc1000/wilc_exported_buf.c
@@ -37,7 +37,7 @@ static inline int kmalloc_wilc_buffer(void *buf, int size)
 {
 	buf = kmalloc(size, GFP_KERNEL);
 	if (!buf) {
-		printk("fail to alloc memory\n");
+		pr_err("fail to alloc memory\n");
 		return -ENOBUFS;
 	}
 	return 0;
@@ -45,7 +45,7 @@ static inline int kmalloc_wilc_buffer(void *buf, int size)
 
 static int __init wilc_module_init(void)
 {
-	printk("wilc_module_init\n");
+	pr_info("wilc_module_init\n");
 	/*
 	 * alloc necessary memory
 	 */
@@ -74,7 +74,7 @@ error_g_tx_buf:
 
 static void __exit wilc_module_deinit(void)
 {
-	printk("wilc_module_deinit\n");
+	pr_info("wilc_module_deinit\n");
 
 	kfree(exported_g_tx_buf);
 	exported_g_tx_buf = NULL;
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1208757

FromDan Carpenter <dan.carpenter@oracle.com>
Date2015-08-17 19:50 +0200
Message-ID<pYwHL-5TN-1@gated-at.bofh.it>
In reply to#1208679
On Mon, Aug 17, 2015 at 12:08:36PM -0400, Raphaël Beamonte wrote:
> Signed-off-by: Raphaël Beamonte <raphael.beamonte@gmail.com>
> ---
>  drivers/staging/wilc1000/coreconfigurator.c  |  4 ++--
>  drivers/staging/wilc1000/linux_wlan.c        |  8 +++----
>  drivers/staging/wilc1000/linux_wlan_common.h | 32 ++++++++++++++--------------
>  drivers/staging/wilc1000/linux_wlan_sdio.c   |  2 +-
>  drivers/staging/wilc1000/linux_wlan_spi.c    |  2 +-
>  drivers/staging/wilc1000/wilc_debugfs.c      | 16 +++++++-------
>  drivers/staging/wilc1000/wilc_exported_buf.c |  6 +++---
>  7 files changed, 35 insertions(+), 35 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
> index c81c41d..0cbf4a9c 100644
> --- a/drivers/staging/wilc1000/coreconfigurator.c
> +++ b/drivers/staging/wilc1000/coreconfigurator.c
> @@ -2007,7 +2007,7 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
>  							pstrWIDs[counter].u16WIDid,
>  							(counter == u32WIDsCount - 1), drvHandler)) {
>  				ret = -1;
> -				printk("[Sendconfigpkt]Get Timed out\n");
> +				pr_debug("[Sendconfigpkt]Get Timed out\n");


Possibly pr_err()?


>  				break;
>  			}
>  		}
> @@ -2029,7 +2029,7 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
>  							pstrWIDs[counter].s32ValueSize,
>  							(counter == u32WIDsCount - 1), drvHandler)) {
>  				ret = -1;
> -				printk("[Sendconfigpkt]Set Timed out\n");
> +				pr_debug("[Sendconfigpkt]Set Timed out\n");
>  				break;
>  			}
>  		}
> diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
> index 040e55d..1f32c36 100644
> --- a/drivers/staging/wilc1000/linux_wlan.c
> +++ b/drivers/staging/wilc1000/linux_wlan.c
> @@ -1306,7 +1306,7 @@ void wilc1000_wlan_deinit(linux_wlan_t *nic)
>  
>  	if (g_linux_wlan->wilc1000_initialized)	{
>  
> -		printk("Deinitializing wilc1000  ...\n");
> +		pr_info("Deinitializing wilc1000  ...\n");

debug.

>  
>  		if (nic == NULL) {
>  			PRINT_ER("nic is NULL\n");
> @@ -2565,8 +2565,8 @@ static int __init init_wilc_driver(void)
>  	}
>  #endif
>  
> -	printk("IN INIT FUNCTION\n");
> -	printk("*** WILC1000 driver VERSION=[10.2] FW_VER=[10.2] ***\n");
> +	pr_info("IN INIT FUNCTION\n");

debug.

> +	pr_info("*** WILC1000 driver VERSION=[10.2] FW_VER=[10.2] ***\n");
>  
>  	linux_wlan_device_power(1);
>  	msleep(100);
> @@ -2662,7 +2662,7 @@ static void __exit exit_wilc_driver(void)
>  			kfree(g_linux_wlan);
>  			g_linux_wlan = NULL;
>  		}
> -		printk("Module_exit Done.\n");
> +		pr_info("Module_exit Done.\n");

debug.

>  
>  #if defined(WILC_DEBUGFS)
>  		wilc_debugfs_remove();
> diff --git a/drivers/staging/wilc1000/linux_wlan_common.h b/drivers/staging/wilc1000/linux_wlan_common.h
> index e6ebf3e..14743ae 100644
> --- a/drivers/staging/wilc1000/linux_wlan_common.h
> +++ b/drivers/staging/wilc1000/linux_wlan_common.h
> @@ -54,8 +54,8 @@ extern atomic_t DEBUG_LEVEL;
>  	do {								\
>  		if ((atomic_read(&DEBUG_LEVEL) & DEBUG) &&		\
>  		   ((atomic_read(&REGION)) & (region))) {		\
> -			printk("DBG [%s: %d]", __func__, __LINE__);	\
> -			printk(__VA_ARGS__);				\
> +			pr_debug("DBG [%s: %d]", __func__, __LINE__);	\
> +			pr_debug(__VA_ARGS__);				\

This is a behavior change, I think.  pr_debug() needs to be turned on?

>  		}							\
>  	} while (0)
>  
> @@ -63,8 +63,8 @@ extern atomic_t DEBUG_LEVEL;
>  	do {								\
>  		if ((atomic_read(&DEBUG_LEVEL) & INFO) &&		\
>  		   ((atomic_read(&REGION)) & (region))) {		\
> -			printk("INFO [%s]", __func__);			\
> -			printk(__VA_ARGS__);				\
> +			pr_info("INFO [%s]", __func__);			\
> +			pr_info(__VA_ARGS__);				\
>  		}							\
>  	} while (0)
>  
> @@ -72,16 +72,16 @@ extern atomic_t DEBUG_LEVEL;
>  	do {								\
>  		if ((atomic_read(&DEBUG_LEVEL) & WRN) &&		\
>  		   ((atomic_read(&REGION)) & (region))) {		\
> -			printk("WRN [%s: %d]", __func__, __LINE__);	\
> -			printk(__VA_ARGS__);				\
> +			pr_warning("WRN [%s: %d]", __func__, __LINE__);	\
> +			pr_warning(__VA_ARGS__);				\
>  		}							\
>  	} while (0)
>  
>  #define PRINT_ER(...)							\
>  	do {								\
>  		if ((atomic_read(&DEBUG_LEVEL) & ERR)) {		\
> -			printk("ERR [%s: %d]", __func__, __LINE__);	\
> -			printk(__VA_ARGS__);				\
> +			pr_err("ERR [%s: %d]", __func__, __LINE__);	\
> +			pr_err(__VA_ARGS__);				\
>  		}							\
>  	} while (0)
>  
> @@ -96,31 +96,31 @@ extern atomic_t DEBUG_LEVEL;
>  #define PRINT_D(region, ...)						\
>  	do {								\
>  		if (DEBUG == 1 && ((REGION)&(region))) {		\
> -			printk("DBG [%s: %d]", __func__, __LINE__);	\
> -			printk(__VA_ARGS__);				\
> +			pr_debug("DBG [%s: %d]", __func__, __LINE__);	\
> +			pr_debug(__VA_ARGS__);				\
>  		}							\
>  	} while (0)
>  
>  #define PRINT_INFO(region, ...)						\
>  	do {								\
>  		if (INFO == 1 && ((REGION)&(region))) {			\
> -			printk("INFO [%s]", __func__);			\
> -			printk(__VA_ARGS__);				\
> +			pr_info("INFO [%s]", __func__);			\
> +			pr_info(__VA_ARGS__);				\
>  		}							\
>  	} while (0)
>  
>  #define PRINT_WRN(region, ...)						\
>  	do {								\
>  		if (WRN == 1 && ((REGION)&(region))) {			\
> -			printk("WRN [%s: %d]", __func__, __LINE__);	\
> -			printk(__VA_ARGS__);				\
> +			pr_warning("WRN [%s: %d]", __func__, __LINE__);	\
> +			pr_warning(__VA_ARGS__);				\
>  		}							\
>  	} while (0)
>  
>  #define PRINT_ER(...)							\
>  	do {								\
> -		printk("ERR [%s: %d]", __func__, __LINE__);		\
> -		printk(__VA_ARGS__);					\
> +		pr_err("ERR [%s: %d]", __func__, __LINE__);		\
> +		pr_err(__VA_ARGS__);					\
>  	} while (0)
>  #endif
>  
> diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c b/drivers/staging/wilc1000/linux_wlan_sdio.c
> index 37f31f4..13d7f84 100644
> --- a/drivers/staging/wilc1000/linux_wlan_sdio.c
> +++ b/drivers/staging/wilc1000/linux_wlan_sdio.c
> @@ -136,7 +136,7 @@ static int linux_sdio_probe(struct sdio_func *func, const struct sdio_device_id
>  		return -1;
>  	}
>  
> -	printk("Driver Initializing success\n");
> +	pr_info("Driver Initializing success\n");
>  	return 0;
>  }
>  
> diff --git a/drivers/staging/wilc1000/linux_wlan_spi.c b/drivers/staging/wilc1000/linux_wlan_spi.c
> index 236669c..0bb68a5 100644
> --- a/drivers/staging/wilc1000/linux_wlan_spi.c
> +++ b/drivers/staging/wilc1000/linux_wlan_spi.c
> @@ -50,7 +50,7 @@ static int __init wilc_bus_probe(struct spi_device *spi)
>  	PRINT_D(BUS_DBG, "spiMax-Speed: %d\n", spi->max_speed_hz);
>  	wilc_spi_dev = spi;
>  
> -	printk("Driver Initializing success\n");
> +	pr_info("Driver Initializing success\n");
>  	return 0;
>  }
>  
> diff --git a/drivers/staging/wilc1000/wilc_debugfs.c b/drivers/staging/wilc1000/wilc_debugfs.c
> index be2e901..588b167 100644
> --- a/drivers/staging/wilc1000/wilc_debugfs.c
> +++ b/drivers/staging/wilc1000/wilc_debugfs.c
> @@ -68,16 +68,16 @@ static ssize_t wilc_debug_level_write(struct file *filp, const char *buf, size_t
>  		flag = 100;
>  
>  	if (flag > DBG_LEVEL_ALL) {
> -		printk("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(&DEBUG_LEVEL));
> +		pr_err("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(&DEBUG_LEVEL));
>  		return -EFAULT;
>  	}
>  
>  	atomic_set(&DEBUG_LEVEL, (int)flag);
>  
>  	if (flag == 0)
> -		printk("Debug-level disabled\n");
> +		pr_info("Debug-level disabled\n");
>  	else
> -		printk("Debug-level enabled\n");
> +		pr_info("Debug-level enabled\n");

Ugh...  I guess debug?  Eventually we will want to remove most of this
debug code.  It's just lazy and messy.


>  	return count;
>  }
>  
> @@ -110,12 +110,12 @@ static ssize_t wilc_debug_region_write(struct file *filp, const char *buf, size_
>  	flag = buffer[0] - '0';
>  
>  	if (flag > DBG_REGION_ALL) {
> -		printk("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(&REGION));
> +		pr_err("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(&REGION));
>  		return -EFAULT;
>  	}
>  
>  	atomic_set(&REGION, (int)flag);
> -	printk("new debug-region is %x\n", atomic_read(&REGION));
> +	pr_info("new debug-region is %x\n", atomic_read(&REGION));

debug.

>  
>  	return count;
>  }
> @@ -154,12 +154,12 @@ int wilc_debugfs_init(void)
>  	wilc_dir = debugfs_create_dir("wilc_wifi", NULL);
>  	if (wilc_dir ==  ERR_PTR(-ENODEV)) {
>  		/* it's not error. the debugfs is just not being enabled. */
> -		printk("ERR, kernel has built without debugfs support\n");
> +		pr_err("kernel has built without debugfs support\n");
>  		return 0;
>  	}
>  
>  	if (!wilc_dir) {
> -		printk("ERR, debugfs create dir\n");
> +		pr_err("debugfs create dir\n");
>  		return -1;
>  	}
>  
> @@ -172,7 +172,7 @@ int wilc_debugfs_init(void)
>  						    &info->fops);
>  
>  		if (!debugfs_files) {
> -			printk("ERR fail to create the debugfs file, %s\n", info->name);
> +			pr_err("fail to create the debugfs file, %s\n", info->name);
>  			debugfs_remove_recursive(wilc_dir);
>  			return -1;
>  		}
> diff --git a/drivers/staging/wilc1000/wilc_exported_buf.c b/drivers/staging/wilc1000/wilc_exported_buf.c
> index c3aff9a..ceacfe2 100644
> --- a/drivers/staging/wilc1000/wilc_exported_buf.c
> +++ b/drivers/staging/wilc1000/wilc_exported_buf.c
> @@ -37,7 +37,7 @@ static inline int kmalloc_wilc_buffer(void *buf, int size)
>  {
>  	buf = kmalloc(size, GFP_KERNEL);
>  	if (!buf) {
> -		printk("fail to alloc memory\n");
> +		pr_err("fail to alloc memory\n");

Delete this.

>  		return -ENOBUFS;
>  	}
>  	return 0;
> @@ -45,7 +45,7 @@ static inline int kmalloc_wilc_buffer(void *buf, int size)
>  
>  static int __init wilc_module_init(void)
>  {
> -	printk("wilc_module_init\n");
> +	pr_info("wilc_module_init\n");

Delete this.  We have ftrae.

>  	/*
>  	 * alloc necessary memory
>  	 */
> @@ -74,7 +74,7 @@ error_g_tx_buf:
>  
>  static void __exit wilc_module_deinit(void)
>  {
> -	printk("wilc_module_deinit\n");
> +	pr_info("wilc_module_deinit\n");

Delete this.

>  
>  	kfree(exported_g_tx_buf);
>  	exported_g_tx_buf = NULL;
> -- 
> 2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1208767

FromRaphaël Beamonte <raphael.beamonte@gmail.com>
Date2015-08-17 20:10 +0200
Message-ID<pYx18-6vH-9@gated-at.bofh.it>
In reply to#1208757
2015-08-17 13:47 GMT-04:00 Dan Carpenter <dan.carpenter@oracle.com>:
>> -                             printk("[Sendconfigpkt]Get Timed out\n");
>> +                             pr_debug("[Sendconfigpkt]Get Timed out\n");
>
>
> Possibly pr_err()?

Yep. My mistake. I'll do the same for Set Timed Out also!

>> -                     printk("DBG [%s: %d]", __func__, __LINE__);     \
>> -                     printk(__VA_ARGS__);                            \
>> +                     pr_debug("DBG [%s: %d]", __func__, __LINE__);   \
>> +                     pr_debug(__VA_ARGS__);                          \
>
> This is a behavior change, I think.  pr_debug() needs to be turned on?

Yes... I didn't pay attention to that! pr_debug needs -DDEBUG in the makefile.
Should I use pr_info here? Or just acknowledge the behavior change for
the moment,
as the next aim is probably, as you said, to remove all the local
debug code? (it is
actually part of the TODO of this driver... So I could just work on that next.)

I'll include your other log level advices and send a new version.
Thanks for your
reviewing time!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1208771

FromDan Carpenter <dan.carpenter@oracle.com>
Date2015-08-17 20:10 +0200
Message-ID<pYx19-6vH-19@gated-at.bofh.it>
In reply to#1208767
On Mon, Aug 17, 2015 at 01:59:44PM -0400, Raphaël Beamonte wrote:
> 2015-08-17 13:47 GMT-04:00 Dan Carpenter <dan.carpenter@oracle.com>:
> >> -                             printk("[Sendconfigpkt]Get Timed out\n");
> >> +                             pr_debug("[Sendconfigpkt]Get Timed out\n");
> >
> >
> > Possibly pr_err()?
> 
> Yep. My mistake. I'll do the same for Set Timed Out also!
> 
> >> -                     printk("DBG [%s: %d]", __func__, __LINE__);     \
> >> -                     printk(__VA_ARGS__);                            \
> >> +                     pr_debug("DBG [%s: %d]", __func__, __LINE__);   \
> >> +                     pr_debug(__VA_ARGS__);                          \
> >
> > This is a behavior change, I think.  pr_debug() needs to be turned on?
> 
> Yes... I didn't pay attention to that! pr_debug needs -DDEBUG in the makefile.
> Should I use pr_info here? Or just acknowledge the behavior change for
> the moment,
> as the next aim is probably, as you said, to remove all the local
> debug code? (it is
> actually part of the TODO of this driver... So I could just work on that next.)

I would probably just do the rest and leave this part as-is since you're
planning to redo it all anyway.  I guess just do stuff which is obvious
and hopefully more and more stuff will become obvious as you go along.
This is a lazy answer but I don't want to think about this driver very
hard...  :P

Also always try to order your patches from least controversial to most
controversial.  It makes it easier to redo things or sometimes Greg
applies the first part of a patch series.

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web