Return-path: Received: from mail-ig0-f169.google.com ([209.85.213.169]:36968 "EHLO mail-ig0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755837AbbHQQI4 (ORCPT ); Mon, 17 Aug 2015 12:08:56 -0400 From: =?UTF-8?q?Rapha=C3=ABl=20Beamonte?= To: Johnny Kim Cc: =?UTF-8?q?Rapha=C3=ABl=20Beamonte?= , Rachel Kim , Dean Lee , Chris Park , Greg Kroah-Hartman , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Dan Carpenter Subject: [PATCH 4/5] staging: wilc1000: use pr_* instead of printk Date: Mon, 17 Aug 2015 12:08:36 -0400 Message-Id: <4feb986f253ce20790cafabbf2262c0cc1f2be92.1439827537.git.raphael.beamonte@gmail.com> (sfid-20150817_180959_578964_C06AF227) In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: Signed-off-by: Raphaël Beamonte --- 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(®ION)) & (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(®ION)) & (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(®ION)) & (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(®ION)); + pr_err("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(®ION)); return -EFAULT; } atomic_set(®ION, (int)flag); - printk("new debug-region is %x\n", atomic_read(®ION)); + pr_info("new debug-region is %x\n", atomic_read(®ION)); 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