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_info, dev_err, etc. Thus, functions like pr_info should not
normally be used after a call to devm_kzalloc. Thus, all pr_err occurances are
replaced with dev_err function calls

Signed-off-by: G Pooja Shamili <poojashamili@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index b0877a88b24cc857d4cfe70f06fcd310dea63788..aa1cdf602cf6b1b347b1f58a5447a543b246aa8d 100644 (file)
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -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;
                }
 
@@ -1048,7 +1049,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;
                }
@@ -1083,7 +1085,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;
                        }
                }
@@ -1096,8 +1099,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);