diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 45a68457504..d24eb47d370 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -27,6 +27,8 @@ | |||
27 | * | 27 | * |
28 | *****************************************************************************/ | 28 | *****************************************************************************/ |
29 | 29 | ||
30 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
31 | |||
30 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
31 | #include <linux/module.h> | 33 | #include <linux/module.h> |
32 | #include <linux/init.h> | 34 | #include <linux/init.h> |
@@ -3933,7 +3935,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
3933 | * space for this driver's private structure */ | 3935 | * space for this driver's private structure */ |
3934 | hw = iwl_alloc_all(cfg, &iwl3945_hw_ops); | 3936 | hw = iwl_alloc_all(cfg, &iwl3945_hw_ops); |
3935 | if (hw == NULL) { | 3937 | if (hw == NULL) { |
3936 | printk(KERN_ERR DRV_NAME "Can not allocate network device\n"); | 3938 | pr_err("Can not allocate network device\n"); |
3937 | err = -ENOMEM; | 3939 | err = -ENOMEM; |
3938 | goto out; | 3940 | goto out; |
3939 | } | 3941 | } |
@@ -4225,19 +4227,18 @@ static int __init iwl3945_init(void) | |||
4225 | { | 4227 | { |
4226 | 4228 | ||
4227 | int ret; | 4229 | int ret; |
4228 | printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n"); | 4230 | pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n"); |
4229 | printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n"); | 4231 | pr_info(DRV_COPYRIGHT "\n"); |
4230 | 4232 | ||
4231 | ret = iwl3945_rate_control_register(); | 4233 | ret = iwl3945_rate_control_register(); |
4232 | if (ret) { | 4234 | if (ret) { |
4233 | printk(KERN_ERR DRV_NAME | 4235 | pr_err("Unable to register rate control algorithm: %d\n", ret); |
4234 | "Unable to register rate control algorithm: %d\n", ret); | ||
4235 | return ret; | 4236 | return ret; |
4236 | } | 4237 | } |
4237 | 4238 | ||
4238 | ret = pci_register_driver(&iwl3945_driver); | 4239 | ret = pci_register_driver(&iwl3945_driver); |
4239 | if (ret) { | 4240 | if (ret) { |
4240 | printk(KERN_ERR DRV_NAME "Unable to initialize PCI module\n"); | 4241 | pr_err("Unable to initialize PCI module\n"); |
4241 | goto error_register; | 4242 | goto error_register; |
4242 | } | 4243 | } |
4243 | 4244 | ||