diff options
author | Joe Perches <joe@perches.com> | 2012-03-18 20:30:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-10 14:52:13 -0400 |
commit | 516304b0f45614fb8967dc86ff681499204cdbb1 (patch) | |
tree | 0bbd4315ab59c25451e0d8baeecd69ff9f7c9f31 /drivers/net/wireless/ath/ath9k/init.c | |
parent | 47107e84446f4724d25c724493679cc50eeef53c (diff) |
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: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index b8f3423fdbf9..fc8156eb6eba 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
@@ -14,6 +14,8 @@ | |||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
18 | |||
17 | #include <linux/dma-mapping.h> | 19 | #include <linux/dma-mapping.h> |
18 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
19 | #include <linux/ath9k_platform.h> | 21 | #include <linux/ath9k_platform.h> |
@@ -867,17 +869,14 @@ static int __init ath9k_init(void) | |||
867 | /* Register rate control algorithm */ | 869 | /* Register rate control algorithm */ |
868 | error = ath_rate_control_register(); | 870 | error = ath_rate_control_register(); |
869 | if (error != 0) { | 871 | if (error != 0) { |
870 | printk(KERN_ERR | 872 | pr_err("Unable to register rate control algorithm: %d\n", |
871 | "ath9k: Unable to register rate control " | 873 | error); |
872 | "algorithm: %d\n", | ||
873 | error); | ||
874 | goto err_out; | 874 | goto err_out; |
875 | } | 875 | } |
876 | 876 | ||
877 | error = ath_pci_init(); | 877 | error = ath_pci_init(); |
878 | if (error < 0) { | 878 | if (error < 0) { |
879 | printk(KERN_ERR | 879 | pr_err("No PCI devices found, driver not installed\n"); |
880 | "ath9k: No PCI devices found, driver not installed.\n"); | ||
881 | error = -ENODEV; | 880 | error = -ENODEV; |
882 | goto err_rate_unregister; | 881 | goto err_rate_unregister; |
883 | } | 882 | } |
@@ -906,6 +905,6 @@ static void __exit ath9k_exit(void) | |||
906 | ath_ahb_exit(); | 905 | ath_ahb_exit(); |
907 | ath_pci_exit(); | 906 | ath_pci_exit(); |
908 | ath_rate_control_unregister(); | 907 | ath_rate_control_unregister(); |
909 | printk(KERN_INFO "%s: Driver unloaded\n", dev_info); | 908 | pr_info("%s: Driver unloaded\n", dev_info); |
910 | } | 909 | } |
911 | module_exit(ath9k_exit); | 910 | module_exit(ath9k_exit); |