Commit 516304b0 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville

ath: Add and use pr_fmt, convert printks to pr_<level>

Use a more current logging style.
Make sure all output is prefixed appropriately.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 47107e84
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
...@@ -728,33 +730,25 @@ void ...@@ -728,33 +730,25 @@ void
ath5k_ani_print_counters(struct ath5k_hw *ah) ath5k_ani_print_counters(struct ath5k_hw *ah)
{ {
/* clears too */ /* clears too */
printk(KERN_NOTICE "ACK fail\t%d\n", pr_notice("ACK fail\t%d\n", ath5k_hw_reg_read(ah, AR5K_ACK_FAIL));
ath5k_hw_reg_read(ah, AR5K_ACK_FAIL)); pr_notice("RTS fail\t%d\n", ath5k_hw_reg_read(ah, AR5K_RTS_FAIL));
printk(KERN_NOTICE "RTS fail\t%d\n", pr_notice("RTS success\t%d\n", ath5k_hw_reg_read(ah, AR5K_RTS_OK));
ath5k_hw_reg_read(ah, AR5K_RTS_FAIL)); pr_notice("FCS error\t%d\n", ath5k_hw_reg_read(ah, AR5K_FCS_FAIL));
printk(KERN_NOTICE "RTS success\t%d\n",
ath5k_hw_reg_read(ah, AR5K_RTS_OK));
printk(KERN_NOTICE "FCS error\t%d\n",
ath5k_hw_reg_read(ah, AR5K_FCS_FAIL));
/* no clear */ /* no clear */
printk(KERN_NOTICE "tx\t%d\n", pr_notice("tx\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_TX));
ath5k_hw_reg_read(ah, AR5K_PROFCNT_TX)); pr_notice("rx\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_RX));
printk(KERN_NOTICE "rx\t%d\n", pr_notice("busy\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_RXCLR));
ath5k_hw_reg_read(ah, AR5K_PROFCNT_RX)); pr_notice("cycles\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_CYCLE));
printk(KERN_NOTICE "busy\t%d\n",
ath5k_hw_reg_read(ah, AR5K_PROFCNT_RXCLR)); pr_notice("AR5K_PHYERR_CNT1\t%d\n",
printk(KERN_NOTICE "cycles\t%d\n", ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT1));
ath5k_hw_reg_read(ah, AR5K_PROFCNT_CYCLE)); pr_notice("AR5K_PHYERR_CNT2\t%d\n",
ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT2));
printk(KERN_NOTICE "AR5K_PHYERR_CNT1\t%d\n", pr_notice("AR5K_OFDM_FIL_CNT\t%d\n",
ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT1)); ath5k_hw_reg_read(ah, AR5K_OFDM_FIL_CNT));
printk(KERN_NOTICE "AR5K_PHYERR_CNT2\t%d\n", pr_notice("AR5K_CCK_FIL_CNT\t%d\n",
ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT2)); ath5k_hw_reg_read(ah, AR5K_CCK_FIL_CNT));
printk(KERN_NOTICE "AR5K_OFDM_FIL_CNT\t%d\n",
ath5k_hw_reg_read(ah, AR5K_OFDM_FIL_CNT));
printk(KERN_NOTICE "AR5K_CCK_FIL_CNT\t%d\n",
ath5k_hw_reg_read(ah, AR5K_CCK_FIL_CNT));
} }
#endif #endif
...@@ -76,26 +76,28 @@ ...@@ -76,26 +76,28 @@
GENERIC DRIVER DEFINITIONS GENERIC DRIVER DEFINITIONS
\****************************/ \****************************/
#define ATH5K_PRINTF(fmt, ...) \ #define ATH5K_PRINTF(fmt, ...) \
printk(KERN_WARNING "%s: " fmt, __func__, ##__VA_ARGS__) pr_warn("%s: " fmt, __func__, ##__VA_ARGS__)
#define ATH5K_PRINTK(_sc, _level, _fmt, ...) \ #define ATH5K_PRINTK(_sc, _level, _fmt, ...) \
printk(_level "ath5k %s: " _fmt, \ printk(_level pr_fmt("%s%s" _fmt), \
((_sc) && (_sc)->hw) ? wiphy_name((_sc)->hw->wiphy) : "", \ ((_sc) && (_sc)->hw) ? wiphy_name((_sc)->hw->wiphy) : "", \
##__VA_ARGS__) ((_sc) && (_sc)->hw) ? ": " : "", \
##__VA_ARGS__)
#define ATH5K_PRINTK_LIMIT(_sc, _level, _fmt, ...) do { \
if (net_ratelimit()) \ #define ATH5K_PRINTK_LIMIT(_sc, _level, _fmt, ...) \
ATH5K_PRINTK(_sc, _level, _fmt, ##__VA_ARGS__); \ do { \
} while (0) if (net_ratelimit()) \
ATH5K_PRINTK(_sc, _level, _fmt, ##__VA_ARGS__); \
} while (0)
#define ATH5K_INFO(_sc, _fmt, ...) \ #define ATH5K_INFO(_sc, _fmt, ...) \
ATH5K_PRINTK(_sc, KERN_INFO, _fmt, ##__VA_ARGS__) ATH5K_PRINTK(_sc, KERN_INFO, _fmt, ##__VA_ARGS__)
#define ATH5K_WARN(_sc, _fmt, ...) \ #define ATH5K_WARN(_sc, _fmt, ...) \
ATH5K_PRINTK_LIMIT(_sc, KERN_WARNING, _fmt, ##__VA_ARGS__) ATH5K_PRINTK_LIMIT(_sc, KERN_WARNING, _fmt, ##__VA_ARGS__)
#define ATH5K_ERR(_sc, _fmt, ...) \ #define ATH5K_ERR(_sc, _fmt, ...) \
ATH5K_PRINTK_LIMIT(_sc, KERN_ERR, _fmt, ##__VA_ARGS__) ATH5K_PRINTK_LIMIT(_sc, KERN_ERR, _fmt, ##__VA_ARGS__)
/* /*
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
* Attach/Detach Functions and helpers * * Attach/Detach Functions and helpers *
\*************************************/ \*************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "ath5k.h" #include "ath5k.h"
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
* *
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
......
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGES. * THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/export.h> #include <linux/export.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
...@@ -254,10 +257,10 @@ static ssize_t write_file_beacon(struct file *file, ...@@ -254,10 +257,10 @@ static ssize_t write_file_beacon(struct file *file,
if (strncmp(buf, "disable", 7) == 0) { if (strncmp(buf, "disable", 7) == 0) {
AR5K_REG_DISABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE); AR5K_REG_DISABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE);
printk(KERN_INFO "debugfs disable beacons\n"); pr_info("debugfs disable beacons\n");
} else if (strncmp(buf, "enable", 6) == 0) { } else if (strncmp(buf, "enable", 6) == 0) {
AR5K_REG_ENABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE); AR5K_REG_ENABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE);
printk(KERN_INFO "debugfs enable beacons\n"); pr_info("debugfs enable beacons\n");
} }
return count; return count;
} }
...@@ -457,19 +460,19 @@ static ssize_t write_file_antenna(struct file *file, ...@@ -457,19 +460,19 @@ static ssize_t write_file_antenna(struct file *file,
if (strncmp(buf, "diversity", 9) == 0) { if (strncmp(buf, "diversity", 9) == 0) {
ath5k_hw_set_antenna_mode(ah, AR5K_ANTMODE_DEFAULT); ath5k_hw_set_antenna_mode(ah, AR5K_ANTMODE_DEFAULT);
printk(KERN_INFO "ath5k debug: enable diversity\n"); pr_info("debug: enable diversity\n");
} else if (strncmp(buf, "fixed-a", 7) == 0) { } else if (strncmp(buf, "fixed-a", 7) == 0) {
ath5k_hw_set_antenna_mode(ah, AR5K_ANTMODE_FIXED_A); ath5k_hw_set_antenna_mode(ah, AR5K_ANTMODE_FIXED_A);
printk(KERN_INFO "ath5k debugfs: fixed antenna A\n"); pr_info("debug: fixed antenna A\n");
} else if (strncmp(buf, "fixed-b", 7) == 0) { } else if (strncmp(buf, "fixed-b", 7) == 0) {
ath5k_hw_set_antenna_mode(ah, AR5K_ANTMODE_FIXED_B); ath5k_hw_set_antenna_mode(ah, AR5K_ANTMODE_FIXED_B);
printk(KERN_INFO "ath5k debug: fixed antenna B\n"); pr_info("debug: fixed antenna B\n");
} else if (strncmp(buf, "clear", 5) == 0) { } else if (strncmp(buf, "clear", 5) == 0) {
for (i = 0; i < ARRAY_SIZE(ah->stats.antenna_rx); i++) { for (i = 0; i < ARRAY_SIZE(ah->stats.antenna_rx); i++) {
ah->stats.antenna_rx[i] = 0; ah->stats.antenna_rx[i] = 0;
ah->stats.antenna_tx[i] = 0; ah->stats.antenna_tx[i] = 0;
} }
printk(KERN_INFO "ath5k debug: cleared antenna stats\n"); pr_info("debug: cleared antenna stats\n");
} }
return count; return count;
} }
...@@ -639,7 +642,7 @@ static ssize_t write_file_frameerrors(struct file *file, ...@@ -639,7 +642,7 @@ static ssize_t write_file_frameerrors(struct file *file,
st->txerr_fifo = 0; st->txerr_fifo = 0;
st->txerr_filt = 0; st->txerr_filt = 0;
st->tx_all_count = 0; st->tx_all_count = 0;
printk(KERN_INFO "ath5k debug: cleared frameerrors stats\n"); pr_info("debug: cleared frameerrors stats\n");
} }
return count; return count;
} }
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
Hardware Descriptor Functions Hardware Descriptor Functions
\******************************/ \******************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
* status registers (ISR). * status registers (ISR).
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
* EEPROM access functions and helpers * * EEPROM access functions and helpers *
\*************************************/ \*************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/slab.h> #include <linux/slab.h>
#include "ath5k.h" #include "ath5k.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* *
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
...@@ -1574,8 +1576,7 @@ ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool skip_pcu) ...@@ -1574,8 +1576,7 @@ ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool skip_pcu)
/* AR5K_MODE_11B */ /* AR5K_MODE_11B */
if (mode > 2) { if (mode > 2) {
ATH5K_ERR(ah, ATH5K_ERR(ah, "unsupported channel mode: %d\n", mode);
"unsupported channel mode: %d\n", mode);
return -EINVAL; return -EINVAL;
} }
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
* *
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/pci.h> #include <linux/pci.h>
#include "ath5k.h" #include "ath5k.h"
......
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
* *
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <net/mac80211.h> #include <net/mac80211.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/nl80211.h> #include <linux/nl80211.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pci-aspm.h> #include <linux/pci-aspm.h>
...@@ -347,7 +349,7 @@ init_ath5k_pci(void) ...@@ -347,7 +349,7 @@ init_ath5k_pci(void)
ret = pci_register_driver(&ath5k_pci_driver); ret = pci_register_driver(&ath5k_pci_driver);
if (ret) { if (ret) {
printk(KERN_ERR "ath5k_pci: can't register pci driver\n"); pr_err("pci: can't register pci driver\n");
return ret; return ret;
} }
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
* PHY related functions * * PHY related functions *
\***********************/ \***********************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
Queue Control Unit, DCF Control Unit Functions Queue Control Unit, DCF Control Unit Functions
\********************************************/ \********************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
Reset function and helpers Reset function and helpers
\****************************/ \****************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <linux/pci.h> /* To determine if a card is pci-e */ #include <linux/pci.h> /* To determine if a card is pci-e */
......
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/device.h> #include <linux/device.h>
#include <linux/pci.h> #include <linux/pci.h>
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/inetdevice.h> #include <linux/inetdevice.h>
#include <linux/export.h> #include <linux/export.h>
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/export.h> #include <linux/export.h>
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "core.h" #include "core.h"
#include "hif-ops.h" #include "hif-ops.h"
#include "cfg80211.h" #include "cfg80211.h"
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "core.h" #include "core.h"
#include "debug.h" #include "debug.h"
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "htc.h" #include "htc.h"
MODULE_AUTHOR("Atheros Communications"); MODULE_AUTHOR("Atheros Communications");
...@@ -966,9 +968,7 @@ int ath9k_htc_resume(struct htc_target *htc_handle) ...@@ -966,9 +968,7 @@ int ath9k_htc_resume(struct htc_target *htc_handle)
static int __init ath9k_htc_init(void) static int __init ath9k_htc_init(void)
{ {
if (ath9k_hif_usb_init() < 0) { if (ath9k_hif_usb_init() < 0) {
printk(KERN_ERR pr_err("No USB devices found, driver not installed\n");
"ath9k_htc: No USB devices found,"
" driver not installed.\n");
return -ENODEV; return -ENODEV;
} }
...@@ -979,6 +979,6 @@ module_init(ath9k_htc_init); ...@@ -979,6 +979,6 @@ module_init(ath9k_htc_init);
static void __exit ath9k_htc_exit(void) static void __exit ath9k_htc_exit(void)
{ {
ath9k_hif_usb_exit(); ath9k_hif_usb_exit();
printk(KERN_INFO "ath9k_htc: Driver unloaded\n"); pr_info("Driver unloaded\n");
} }
module_exit(ath9k_htc_exit); module_exit(ath9k_htc_exit);
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "htc.h" #include "htc.h"
static int htc_issue_send(struct htc_target *target, struct sk_buff* skb, static int htc_issue_send(struct htc_target *target, struct sk_buff* skb,
...@@ -461,7 +463,7 @@ int ath9k_htc_hw_init(struct htc_target *target, ...@@ -461,7 +463,7 @@ int ath9k_htc_hw_init(struct htc_target *target,
char *product, u32 drv_info) char *product, u32 drv_info)
{ {
if (ath9k_htc_probe_device(target, dev, devid, product, drv_info)) { if (ath9k_htc_probe_device(target, dev, devid, product, drv_info)) {
printk(KERN_ERR "Failed to initialize the device\n"); pr_err("Failed to initialize the device\n");
return -ENODEV; return -ENODEV;
} }
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/ath9k_platform.h> #include <linux/ath9k_platform.h>
...@@ -867,17 +869,14 @@ static int __init ath9k_init(void) ...@@ -867,17 +869,14 @@ static int __init ath9k_init(void)
/* Register rate control algorithm */ /* Register rate control algorithm */
error = ath_rate_control_register(); error = ath_rate_control_register();
if (error != 0) { if (error != 0) {
printk(KERN_ERR pr_err("Unable to register rate control algorithm: %d\n",
"ath9k: Unable to register rate control " error);
"algorithm: %d\n",
error);
goto err_out; goto err_out;
} }
error = ath_pci_init(); error = ath_pci_init();
if (error < 0) { if (error < 0) {
printk(KERN_ERR pr_err("No PCI devices found, driver not installed\n");
"ath9k: No PCI devices found, driver not installed.\n");
error = -ENODEV; error = -ENODEV;
goto err_rate_unregister; goto err_rate_unregister;
} }
...@@ -906,6 +905,6 @@ static void __exit ath9k_exit(void) ...@@ -906,6 +905,6 @@ static void __exit ath9k_exit(void)
ath_ahb_exit(); ath_ahb_exit();
ath_pci_exit(); ath_pci_exit();
ath_rate_control_unregister(); ath_rate_control_unregister();
printk(KERN_INFO "%s: Driver unloaded\n", dev_info); pr_info("%s: Driver unloaded\n", dev_info);
} }
module_exit(ath9k_exit); module_exit(ath9k_exit);
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/nl80211.h> #include <linux/nl80211.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pci-aspm.h> #include <linux/pci-aspm.h>
...@@ -171,14 +173,13 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -171,14 +173,13 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
if (ret) { if (ret) {
printk(KERN_ERR "ath9k: 32-bit DMA not available\n"); pr_err("32-bit DMA not available\n");
goto err_dma; goto err_dma;
} }
ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
if (ret) { if (ret) {
printk(KERN_ERR "ath9k: 32-bit DMA consistent " pr_err("32-bit DMA consistent DMA enable failed\n");
"DMA enable failed\n");
goto err_dma; goto err_dma;
} }
...@@ -224,7 +225,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -224,7 +225,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
mem = pci_iomap(pdev, 0, 0); mem = pci_iomap(pdev, 0, 0);
if (!mem) { if (!mem) {
printk(KERN_ERR "PCI memory map error\n") ; pr_err("PCI memory map error\n") ;
ret = -EIO; ret = -EIO;
goto err_iomap; goto err_iomap;
} }
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -49,7 +51,7 @@ struct sk_buff *ath_rxbuf_alloc(struct ath_common *common, ...@@ -49,7 +51,7 @@ struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,
if (off != 0) if (off != 0)
skb_reserve(skb, common->cachelsz - off); skb_reserve(skb, common->cachelsz - off);
} else { } else {
printk(KERN_ERR "skbuff alloc of size %u failed\n", len); pr_err("skbuff alloc of size %u failed\n", len);
return NULL; return NULL;
} }
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/export.h> #include <linux/export.h>
#include <net/cfg80211.h> #include <net/cfg80211.h>
...@@ -562,7 +564,7 @@ static int __ath_regd_init(struct ath_regulatory *reg) ...@@ -562,7 +564,7 @@ static int __ath_regd_init(struct ath_regulatory *reg)
printk(KERN_DEBUG "ath: EEPROM regdomain: 0x%0x\n", reg->current_rd); printk(KERN_DEBUG "ath: EEPROM regdomain: 0x%0x\n", reg->current_rd);
if (!ath_regd_is_eeprom_valid(reg)) { if (!ath_regd_is_eeprom_valid(reg)) {
printk(KERN_ERR "ath: Invalid EEPROM contents\n"); pr_err("Invalid EEPROM contents\n");
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment