net/wireless: Use pr_<level> and netdev_<level>
PATCH 1/1 net/wireless: Use pr_<level> and netdev_<level>
No change in output for pr_<level> prefixes. netdev_<level> output is different, arguably improved.
Signed-off-by Joe Perches <[email protected]>
--- net/wireless/core.c | 8 +++--- net/wireless/lib80211.c | 8 ++++-- net/wireless/lib80211_crypt_tkip.c | 16 +++++------- net/wireless/reg.c | 47 +++++++++++++---------------------- net/wireless/util.c | 11 +++----- net/wireless/wext-core.c | 10 ++++--- 6 files changed, 44 insertions(+), 56 deletions(-)
net/wireless/core.c +4 -4
@@ -4,6 +4,8 @@* Copyright 2006-2010 Johannes Berg <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/if.h> #include <linux/module.h> #include <linux/err.h>
@@ -216,8 +218,7 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, rdev->wiphy.debugfsdir, rdev->wiphy.debugfsdir->d_parent, newname)) -printk (KERN_ERR "cfg80211: failed to rename debugfs dir to %s!\n" , - newname); +pr_err ("failed to rename debugfs dir to %s!\n" , newname);nl80211_notify_dev_rename (rdev);
@@ -699,8 +700,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,if (sysfs_create_link (&dev->dev.kobj, &rdev->wiphy.dev.kobj,"phy80211" )) { -printk (KERN_ERR "wireless: failed to add phy80211 " -"symlink to netdev!\n" ); +pr_err ("failed to add phy80211 symlink to netdev!\n" ); } wdev->netdev = dev; wdev->sme_state =CFG80211_SME_IDLE ;
net/wireless/lib80211.c +5 -3
@@ -13,6 +13,8 @@* */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/ctype.h> #include <linux/ieee80211.h>
@@ -224,8 +226,8 @@ int lib80211_unregister_crypto_ops(struct lib80211_crypto_ops *ops)return -EINVAL ; found: -printk (KERN_DEBUG "lib80211_crypt: unregistered algorithm " -"'%s'\n" , ops->name); +printk (KERN_DEBUG "lib80211_crypt: unregistered algorithm '%s'\n" , + ops->name);list_del (&alg->list);spin_unlock_irqrestore (&lib80211_crypto_lock, flags);kfree (alg);
@@ -270,7 +272,7 @@ static struct lib80211_crypto_ops lib80211_crypt_null = {static int __init lib80211_init (void ) { - printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION "\n"); +pr_info (DRV_DESCRIPTION "\n" );return lib80211_register_crypto_ops (&lib80211_crypt_null); }
net/wireless/lib80211_crypt_tkip.c +7 -9
@@ -10,6 +10,8 @@* more details. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/err.h> #include <linux/module.h> #include <linux/init.h>
@@ -99,8 +101,7 @@ static void *lib80211_tkip_init(int key_idx) priv->tx_tfm_arc4 =crypto_alloc_blkcipher ("ecb(arc4)" ,0 ,CRYPTO_ALG_ASYNC );if (IS_ERR (priv->tx_tfm_arc4)) { -printk (KERN_DEBUG "lib80211_crypt_tkip: could not allocate " -"crypto API arc4\n" ); + printk(KERN_DEBUG pr_fmt("could not allocate crypto API arc4\n")); priv->tx_tfm_arc4 =NULL ; goto fail; }
@@ -108,8 +109,7 @@ static void *lib80211_tkip_init(int key_idx) priv->tx_tfm_michael =crypto_alloc_hash ("michael_mic" ,0 ,CRYPTO_ALG_ASYNC );if (IS_ERR (priv->tx_tfm_michael)) { -printk (KERN_DEBUG "lib80211_crypt_tkip: could not allocate " -"crypto API michael_mic\n" ); + printk(KERN_DEBUG pr_fmt("could not allocate crypto API michael_mic\n")); priv->tx_tfm_michael =NULL ; goto fail; }
@@ -117,8 +117,7 @@ static void *lib80211_tkip_init(int key_idx) priv->rx_tfm_arc4 =crypto_alloc_blkcipher ("ecb(arc4)" ,0 ,CRYPTO_ALG_ASYNC );if (IS_ERR (priv->rx_tfm_arc4)) { -printk (KERN_DEBUG "lib80211_crypt_tkip: could not allocate " -"crypto API arc4\n" ); + printk(KERN_DEBUG pr_fmt("could not allocate crypto API arc4\n")); priv->rx_tfm_arc4 =NULL ; goto fail; }
@@ -126,8 +125,7 @@ static void *lib80211_tkip_init(int key_idx) priv->rx_tfm_michael =crypto_alloc_hash ("michael_mic" ,0 ,CRYPTO_ALG_ASYNC );if (IS_ERR (priv->rx_tfm_michael)) { -printk (KERN_DEBUG "lib80211_crypt_tkip: could not allocate " -"crypto API michael_mic\n" ); + printk(KERN_DEBUG pr_fmt("could not allocate crypto API michael_mic\n")); priv->rx_tfm_michael =NULL ; goto fail; }
@@ -536,7 +534,7 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr,struct scatterlist sg[2 ];if (tfm_michael ==NULL ) { -printk (KERN_WARNING "michael_mic: tfm_michael == NULL\n" ); +pr_warn ("%s(): tfm_michael == NULL\n" , __func__);return -1 ; }sg_init_table (sg,2 );
net/wireless/reg.c +18 -29
117 lines not on this page · raw message
net/wireless/util.c +4 -7
@@ -502,7 +502,7 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,skb_orphan (skb);if (pskb_expand_head (skb, head_need,0 ,GFP_ATOMIC )) { -printk (KERN_ERR "failed to reallocate Tx buffer\n" ); +pr_err ("failed to reallocate Tx buffer\n" );return -ENOMEM ; } skb->truesize += head_need;
@@ -685,20 +685,17 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev)continue ;if (rdev->ops->add_key (wdev->wiphy, dev, i, false,NULL , &wdev->connect_keys->params[i])) { -printk (KERN_ERR "%s: failed to set key %d\n" , - dev->name, i); +netdev_err (dev,"failed to set key %d\n" , i);continue ; }if (wdev->connect_keys->def == i)if (rdev->ops->set_default_key (wdev->wiphy, dev, i)) { -printk (KERN_ERR "%s: failed to set defkey %d\n" , - dev->name, i); +netdev_err (dev,"failed to set defkey %d\n" , i);continue ; }if (wdev->connect_keys->defmgmt == i)if (rdev->ops->set_default_mgmt_key (wdev->wiphy, dev, i)) -printk (KERN_ERR "%s: failed to set mgtdef %d\n" , - dev->name, i); +netdev_err (dev,"failed to set mgtdef %d\n" , i); }kfree (wdev->connect_keys);
net/wireless/wext-core.c +6 -4
@@ -467,8 +467,8 @@ void wireless_send_event(struct net_device * dev,* The best the driver could do is to log an error message. * We will do it ourselves instead... */ -printk (KERN_ERR "%s (WE) : Invalid/Unknown Wireless Event (0x%04X)\n" , - dev->name, cmd); +netdev_err (dev,"(WE) : Invalid/Unknown Wireless Event (0x%04X)\n" , + cmd);return ; }
@@ -476,11 +476,13 @@ void wireless_send_event(struct net_device * dev,if (descr->header_type ==IW_HEADER_TYPE_POINT ) {/* Check if number of token fits within bounds */ if (wrqu->data.length > descr->max_tokens) { -printk (KERN_ERR "%s (WE) : Wireless Event too big (%d)\n" , dev->name, wrqu->data.length); +netdev_err (dev,"(WE) : Wireless Event too big (%d)\n" , + wrqu->data.length);return ; }if (wrqu->data.length < descr->min_tokens) { -printk (KERN_ERR "%s (WE) : Wireless Event too small (%d)\n" , dev->name, wrqu->data.length); +netdev_err (dev,"(WE) : Wireless Event too small (%d)\n" , + wrqu->data.length);return ; }/* Calculate extra_len - extra is NULL for restricted events */