diff options
-rw-r--r-- | drivers/staging/netlogic/xlr_net.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c index b0877a88b24c..aa1cdf602cf6 100644 --- 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) | |||
1028 | for (port = 0; port < pdev->num_resources / 2; port++) { | 1028 | for (port = 0; port < pdev->num_resources / 2; port++) { |
1029 | ndev = alloc_etherdev_mq(sizeof(struct xlr_net_priv), 32); | 1029 | ndev = alloc_etherdev_mq(sizeof(struct xlr_net_priv), 32); |
1030 | if (!ndev) { | 1030 | if (!ndev) { |
1031 | pr_err("Allocation of Ethernet device failed\n"); | 1031 | dev_err(&pdev->dev, |
1032 | "Allocation of Ethernet device failed\n"); | ||
1032 | return -ENOMEM; | 1033 | return -ENOMEM; |
1033 | } | 1034 | } |
1034 | 1035 | ||
@@ -1048,7 +1049,8 @@ static int xlr_net_probe(struct platform_device *pdev) | |||
1048 | 1049 | ||
1049 | res = platform_get_resource(pdev, IORESOURCE_IRQ, port); | 1050 | res = platform_get_resource(pdev, IORESOURCE_IRQ, port); |
1050 | if (!res) { | 1051 | if (!res) { |
1051 | pr_err("No irq resource for MAC %d\n", priv->port_id); | 1052 | dev_err(&pdev->dev, "No irq resource for MAC %d\n", |
1053 | priv->port_id); | ||
1052 | err = -ENODEV; | 1054 | err = -ENODEV; |
1053 | goto err_gmac; | 1055 | goto err_gmac; |
1054 | } | 1056 | } |
@@ -1083,7 +1085,8 @@ static int xlr_net_probe(struct platform_device *pdev) | |||
1083 | if (strcmp(res->name, "gmac") == 0) { | 1085 | if (strcmp(res->name, "gmac") == 0) { |
1084 | err = xlr_gmac_init(priv, pdev); | 1086 | err = xlr_gmac_init(priv, pdev); |
1085 | if (err) { | 1087 | if (err) { |
1086 | pr_err("gmac%d init failed\n", priv->port_id); | 1088 | dev_err(&pdev->dev, "gmac%d init failed\n", |
1089 | priv->port_id); | ||
1087 | goto err_gmac; | 1090 | goto err_gmac; |
1088 | } | 1091 | } |
1089 | } | 1092 | } |
@@ -1096,8 +1099,9 @@ static int xlr_net_probe(struct platform_device *pdev) | |||
1096 | 1099 | ||
1097 | err = register_netdev(ndev); | 1100 | err = register_netdev(ndev); |
1098 | if (err) { | 1101 | if (err) { |
1099 | pr_err("Registering netdev failed for gmac%d\n", | 1102 | dev_err(&pdev->dev, |
1100 | priv->port_id); | 1103 | "Registering netdev failed for gmac%d\n", |
1104 | priv->port_id); | ||
1101 | goto err_netdev; | 1105 | goto err_netdev; |
1102 | } | 1106 | } |
1103 | platform_set_drvdata(pdev, priv); | 1107 | platform_set_drvdata(pdev, priv); |