|
@@ -444,8 +444,8 @@ static void __axienet_device_reset(struct axienet_local *lp,
|
|
while (axienet_dma_in32(lp, offset) & XAXIDMA_CR_RESET_MASK) {
|
|
while (axienet_dma_in32(lp, offset) & XAXIDMA_CR_RESET_MASK) {
|
|
udelay(1);
|
|
udelay(1);
|
|
if (--timeout == 0) {
|
|
if (--timeout == 0) {
|
|
- dev_err(dev, "axienet_device_reset DMA "
|
|
|
|
- "reset timeout!\n");
|
|
|
|
|
|
+ netdev_err(lp->ndev, "%s: DMA reset timeout!\n",
|
|
|
|
+ __func__);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -484,8 +484,8 @@ static void axienet_device_reset(struct net_device *ndev)
|
|
}
|
|
}
|
|
|
|
|
|
if (axienet_dma_bd_init(ndev)) {
|
|
if (axienet_dma_bd_init(ndev)) {
|
|
- dev_err(&ndev->dev, "axienet_device_reset descriptor "
|
|
|
|
- "allocation failed\n");
|
|
|
|
|
|
+ netdev_err(ndev, "%s: descriptor allocation failed\n",
|
|
|
|
+ __func__);
|
|
}
|
|
}
|
|
|
|
|
|
axienet_status = axienet_ior(lp, XAE_RCW1_OFFSET);
|
|
axienet_status = axienet_ior(lp, XAE_RCW1_OFFSET);
|
|
@@ -560,8 +560,8 @@ static void axienet_adjust_link(struct net_device *ndev)
|
|
lp->last_link = link_state;
|
|
lp->last_link = link_state;
|
|
phy_print_status(phy);
|
|
phy_print_status(phy);
|
|
} else {
|
|
} else {
|
|
- dev_err(&ndev->dev, "Error setting Axi Ethernet "
|
|
|
|
- "mac speed\n");
|
|
|
|
|
|
+ netdev_err(ndev,
|
|
|
|
+ "Error setting Axi Ethernet mac speed\n");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1238,8 +1238,8 @@ axienet_ethtools_set_pauseparam(struct net_device *ndev,
|
|
struct axienet_local *lp = netdev_priv(ndev);
|
|
struct axienet_local *lp = netdev_priv(ndev);
|
|
|
|
|
|
if (netif_running(ndev)) {
|
|
if (netif_running(ndev)) {
|
|
- printk(KERN_ERR "%s: Please stop netif before applying "
|
|
|
|
- "configruation\n", ndev->name);
|
|
|
|
|
|
+ netdev_err(ndev,
|
|
|
|
+ "Please stop netif before applying configuration\n");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1295,8 +1295,8 @@ static int axienet_ethtools_set_coalesce(struct net_device *ndev,
|
|
struct axienet_local *lp = netdev_priv(ndev);
|
|
struct axienet_local *lp = netdev_priv(ndev);
|
|
|
|
|
|
if (netif_running(ndev)) {
|
|
if (netif_running(ndev)) {
|
|
- printk(KERN_ERR "%s: Please stop netif before applying "
|
|
|
|
- "configruation\n", ndev->name);
|
|
|
|
|
|
+ netdev_err(ndev,
|
|
|
|
+ "Please stop netif before applying configuration\n");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|