Skip to contentSkip to conversation

staging: netlogic: Replacing pr_err with dev_err after the call to devm_kzalloc

PATCH Superseded pooja.shamili 1 participant 1 message Mar 3, 2016 Staging

lore
Share & tools
lore

pooja.shamili

author
#0 lore raw

PATCH v2 1/1 staging: netlogic: Replacing pr_err with dev_err after the call to devm_kzalloc

The function devm_kzalloc has a first argument of type struct device *. This is the type of argument required by printing functions such as dev_dbg, dev_err, etc. Thus, functions like pr_err should not normally be used after a call to devm_kzalloc. Thus, all pr_err occurances are replaced with dev_err function calls.

This was done using Coccinelle, the patch being:

@@
expression E1,E2;
expression list args;
identifier I;
@@

E1 = (struct I *)devm_kzalloc(E2, ...);
<...
- pr_err(
+ dev_err(E2,
args);
...>

Signed-off-by pooja.shamili <[email protected]>

---
Changes from version1:
* Removed ++dev_err and replaced it with +dev_err in the
semantic patch as ++ is not necessary.

 drivers/staging/netlogic/xlr_net.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/staging/netlogic/xlr_net.c +11 -7
index 0015847..4804fe8 100644
@@ -1028,7 +1028,8 @@ static int xlr_net_probe(struct platform_device *pdev)
 	for (port = 0; port < pdev->num_resources / 2; port++) {
 		ndev = alloc_etherdev_mq(sizeof(struct xlr_net_priv), 32);
 		if (!ndev) {
-			pr_err("Allocation of Ethernet device failed\n");
+			dev_err(&pdev->dev,
+				"Allocation of Ethernet device failed\n");
 			return -ENOMEM;
 		}
 

@@ -1040,8 +1041,8 @@ static int xlr_net_probe(struct platform_device *pdev)
 		res = platform_get_resource(pdev, IORESOURCE_MEM, port);
 
 		if (res == NULL) {
-			pr_err("No memory resource for MAC %d\n",
-			       priv->port_id);
+			dev_err(&pdev->dev, "No memory resource for MAC %d\n",
+				priv->port_id);
 			err = -ENODEV;
 			goto err_gmac;
 		}

@@ -1055,7 +1056,8 @@ static int xlr_net_probe(struct platform_device *pdev)
 
 		res = platform_get_resource(pdev, IORESOURCE_IRQ, port);
 		if (!res) {
-			pr_err("No irq resource for MAC %d\n", priv->port_id);
+			dev_err(&pdev->dev, "No irq resource for MAC %d\n",
+				priv->port_id);
 			err = -ENODEV;
 			goto err_gmac;
 		}

@@ -1090,7 +1092,8 @@ static int xlr_net_probe(struct platform_device *pdev)
 		if (strcmp(res->name, "gmac") == 0) {
 			err = xlr_gmac_init(priv, pdev);
 			if (err) {
-				pr_err("gmac%d init failed\n", priv->port_id);
+				dev_err(&pdev->dev, "gmac%d init failed\n",
+					priv->port_id);
 				goto err_gmac;
 			}
 		}

@@ -1103,8 +1106,9 @@ static int xlr_net_probe(struct platform_device *pdev)
 
 		err = register_netdev(ndev);
 		if (err) {
-			pr_err("Registering netdev failed for gmac%d\n",
-			       priv->port_id);
+			dev_err(&pdev->dev,
+				"Registering netdev failed for gmac%d\n",
+				priv->port_id);
 			goto err_netdev;
 		}
 		platform_set_drvdata(pdev, priv);
Signature · 1 line
2.1.4