Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: netlogic: Replace pr_* with netdev_*

Replace generic pr_info and pr_err with netdev_info and netdev_err
respectively for net devices.

Found using Coccinelle. The semantic patch used to find this is as
follows:
//<smpl>
@@
expression e;
identifier f,i;
position p;
@@
f(...,struct net_device *i,...) {
...
(
- pr_debug@p (e)
+ netdev_dbg(i, e)
|
- pr_err@p (e)
+ netdev_err(i, e)
|
- pr_info@p (e)
+ netdev_info(i, e)
)
...
}
@@
expression e;
identifier f,i;
position p;
@@

f(...) {
...
struct net_device *n;
...
(
- pr_debug@p (e)
+ netdev_dbg(n, e)
|
- pr_err@p (e)
+ netdev_err(n, e)
|
- pr_info@p (e)
+ netdev_info(n, e)
)
...
}
@a@
identifier s,x;
@@
struct s {
...
struct net_device *x;
...
};

@b depends on a@
expression e;
identifier f,i,a.s,a.x;
position p;
@@

f ( ..., struct s *i, ...) {
...
(
- pr_debug@p (e)
+ netdev_dbg(i->x, e)
|
- pr_err@p (e)
+ netdev_err(i->x, e)
|
- pr_info@p (e)
+ netdev_info(i->x, e)
)
...
}

@c depends on a@
expression e;
identifier f,i,a.s,a.x;
position p;
@@

f (...) {
...
struct s *i = ...;
...
(
- pr_debug@p (e)
+ netdev_dbg(i->x, e)
|
- pr_err@p (e)
+ netdev_err(i->x, e)
|
- pr_info@p (e)
+ netdev_info(i->x, e)
)
...
}
//</smpl>

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Amitoj Kaur Chawla and committed by
Greg Kroah-Hartman
04309886 62e259ed

+3 -3
+3 -3
drivers/staging/netlogic/xlr_net.c
··· 99 99 return 0; 100 100 } while (++num_try < 10000); 101 101 102 - pr_err("Send to RFR failed in RX path\n"); 102 + netdev_err(priv->ndev, "Send to RFR failed in RX path\n"); 103 103 return ret; 104 104 } 105 105 ··· 209 209 for (i = 0; i < MAX_FRIN_SPILL / 4; i++) { 210 210 skb_data = xlr_alloc_skb(); 211 211 if (!skb_data) { 212 - pr_err("SKB allocation failed\n"); 212 + netdev_err(ndev, "SKB allocation failed\n"); 213 213 return -ENOMEM; 214 214 } 215 215 send_to_rfr_fifo(priv, skb_data); 216 216 } 217 - pr_info("Rx ring setup done\n"); 217 + netdev_info(ndev, "Rx ring setup done\n"); 218 218 return 0; 219 219 } 220 220