From 7f91c4c4b0c64d49c688354306eaa649f662c6c0 Mon Sep 17 00:00:00 2001 From: Tom Rix Date: Mon, 3 May 2021 13:31:45 -0700 Subject: [PATCH] net: intel: s10hssi: use dfl dev in dev_err Errors with ethtool_reset() are reported as [ 577.456427] (null): ethtool_reset failed to clear tx stats Instead of the netdev->dev, use the dfl_dev->dev Signed-off-by: Tom Rix --- drivers/net/ethernet/intel/s10hssi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/s10hssi.c b/drivers/net/ethernet/intel/s10hssi.c index dd36114dec05..4374c5f77d8c 100644 --- a/drivers/net/ethernet/intel/s10hssi.c +++ b/drivers/net/ethernet/intel/s10hssi.c @@ -299,6 +299,7 @@ static u64 read_mac_stat(struct regmap *regmap, unsigned int addr) static int ethtool_reset(struct net_device *netdev, u32 *flags) { struct s10hssi_netdata *npriv = netdev_priv(netdev); + struct device *dev = &npriv->dfl_dev->dev; int ret; u32 val; @@ -310,7 +311,7 @@ static int ethtool_reset(struct net_device *netdev, u32 *flags) STATS_CLR_INT_TIMEOUT_US); if (ret) { - dev_err(&netdev->dev, "%s failed to clear tx stats\n", __func__); + dev_err(dev, "%s failed to clear tx stats\n", __func__); return ret; } @@ -321,10 +322,10 @@ static int ethtool_reset(struct net_device *netdev, u32 *flags) STATS_CLR_INT_TIMEOUT_US); if (ret) { - dev_err(&netdev->dev, "%s failed to clear rx stats\n", __func__); + dev_err(dev, "%s failed to clear rx stats\n", __func__); return ret; } - dev_info(&netdev->dev, "%s reset statistics registers\n", __func__); + dev_info(dev, "%s reset statistics registers\n", __func__); } return 0;