Skip to contentSkip to conversation

net: fec_main: Use netdev_err() instead of pr_err()

PATCH Superseded Fabio Estevam 2 participants 4 messages Jun 4, 2019

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 net: fec_main: Use netdev_err() instead of pr_err()

netdev_err() is more appropriate for printing error messages inside network drivers, so switch to netdev_err().

---
Changes since v1:
- Split the changes from fec_main and fec_ptp in two different patches

 drivers/net/ethernet/freescale/fec_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +4 -4
index 848defa33d3a..4ec9733a88d5 100644
@@ -2452,24 +2452,24 @@ fec_enet_set_coalesce(struct net_device *ndev, struct ethtool_coalesce *ec)
 		return -EOPNOTSUPP;
 
 	if (ec->rx_max_coalesced_frames > 255) {
-		pr_err("Rx coalesced frames exceed hardware limitation\n");
+		netdev_err(ndev, "Rx coalesced frames exceed hardware limitation\n");
 		return -EINVAL;
 	}
 
 	if (ec->tx_max_coalesced_frames > 255) {
-		pr_err("Tx coalesced frame exceed hardware limitation\n");
+		netdev_err(ndev, "Tx coalesced frame exceed hardware limitation\n");
 		return -EINVAL;
 	}
 
 	cycle = fec_enet_us_to_itr_clock(ndev, fep->rx_time_itr);
 	if (cycle > 0xFFFF) {
-		pr_err("Rx coalesced usec exceed hardware limitation\n");
+		netdev_err(ndev, "Rx coalesced usec exceed hardware limitation\n");
 		return -EINVAL;
 	}
 
 	cycle = fec_enet_us_to_itr_clock(ndev, fep->tx_time_itr);
 	if (cycle > 0xFFFF) {
-		pr_err("Rx coalesced usec exceed hardware limitation\n");
+		netdev_err(ndev, "Rx coalesced usec exceed hardware limitation\n");
 		return -EINVAL;
 	}
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 2/2 net: fec_ptp: Use dev_err() instead of pr_err()

dev_err() is more appropriate for printing error messages inside drivers, so switch to dev_err().

---
Changes since v1:
- Use dev_err() instead of netdev_err() - Andy

 drivers/net/ethernet/freescale/fec_ptp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/fec_ptp.c +1 -1
index 7e892b1cbd3d..19e2365be7d8 100644
@@ -617,7 +617,7 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx)
 	fep->ptp_clock = ptp_clock_register(&fep->ptp_caps, &pdev->dev);
 	if (IS_ERR(fep->ptp_clock)) {
 		fep->ptp_clock = NULL;
-		pr_err("ptp_clock_register failed\n");
+		dev_err(&pdev->dev, "ptp_clock_register failed\n");
 	}
 
 	schedule_delayed_work(&fep->time_keep, HZ);
Signature · 1 line
2.17.1
Acked-by on v2 2/2
#2 lore raw

RE: [EXT] [PATCH net-next v2 2/2] net: fec_ptp: Use dev_err() instead of pr_err()

From: Fabio Estevam <[email protected]> Sent: Tuesday, June 4, 2019 11:05 AM

Quoted 4 lines

dev_err() is more appropriate for printing error messages inside drivers, so switch to dev_err().

Quoted 24 lines

---
Changes since v1:
- Use dev_err() instead of netdev_err() - Andy

 drivers/net/ethernet/freescale/fec_ptp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/fec_ptp.c +1 -1
index 7e892b1cbd3d..19e2365be7d8 100644
@@ -617,7 +617,7 @@ void fec_ptp_init(struct platform_device *pdev, int
 irq_idx)
        fep->ptp_clock = ptp_clock_register(&fep->ptp_caps, &pdev->dev);
        if (IS_ERR(fep->ptp_clock)) {
                fep->ptp_clock = NULL;
-               pr_err("ptp_clock_register failed\n");
+               dev_err(&pdev->dev, "ptp_clock_register failed\n");
        }
 
        schedule_delayed_work(&fep->time_keep, HZ);

--
2.17.1

#3 lore raw
In reply to Fabio Estevam

From: Fabio Estevam <[email protected]> Sent: Tuesday, June 4, 2019 11:05 AM

Quoted 17 lines

netdev_err() is more appropriate for printing error messages inside network drivers, so switch to netdev_err().

---
Changes since v1:
- Split the changes from fec_main and fec_ptp in two different patches

 drivers/net/ethernet/freescale/fec_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +0 -0
index 848defa33d3a..4ec9733a88d5 100644

drivers/net/ethernet/freescale/fec_main.c fec_enet_set_coalesce(struct net_device *ndev, · line 2458

Quoted 8 lines
drivers/net/ethernet/freescale/fec_main.c +2 -1
@@ -2452,24 +2452,24 @@ fec_enet_set_coalesce(struct net_device *ndev,
 struct ethtool_coalesce *ec)
                return -EOPNOTSUPP;
 
        if (ec->rx_max_coalesced_frames > 255) {
-               pr_err("Rx coalesced frames exceed hardware
 limitation\n");
+               netdev_err(ndev, "Rx coalesced frames exceed hardware
+ limitation\n");

The API still can be called before .register_netdev(), which means ndev is uninitialized.

Quoted 31 lines
drivers/net/ethernet/freescale/fec_main.c +4 -3
                return -EINVAL;
        }
 
        if (ec->tx_max_coalesced_frames > 255) {
-               pr_err("Tx coalesced frame exceed hardware
 limitation\n");
+               netdev_err(ndev, "Tx coalesced frame exceed hardware
+ limitation\n");
                return -EINVAL;
        }
 
        cycle = fec_enet_us_to_itr_clock(ndev, fep->rx_time_itr);
        if (cycle > 0xFFFF) {
-               pr_err("Rx coalesced usec exceed hardware
 limitation\n");
+               netdev_err(ndev, "Rx coalesced usec exceed hardware
+ limitation\n");
                return -EINVAL;
        }
 
        cycle = fec_enet_us_to_itr_clock(ndev, fep->tx_time_itr);
        if (cycle > 0xFFFF) {
-               pr_err("Rx coalesced usec exceed hardware

limitation\n");
+ netdev_err(ndev, "Rx coalesced usec exceed hardware

+ limitation\n");
                return -EINVAL;
        }

--
2.17.1