From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Andre Guedes <andre.guedes@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
Aaron Brown <aaron.f.brown@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 05/13] igc: Use netdev log helpers in igc_ptp.c
Date: Mon, 20 Apr 2020 16:43:05 -0700 [thread overview]
Message-ID: <20200420234313.2184282-6-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20200420234313.2184282-1-jeffrey.t.kirsher@intel.com>
From: Andre Guedes <andre.guedes@intel.com>
In igc_ptp.c we print log messages using dev_* helpers, generating
inconsistent output with the rest of the driver. Since this is a network
device driver, we should preferably use netdev_* helpers because they
append the interface name to the message, helping making sense out of
the logs.
This patch converts all dev_* calls to netdev_*. It also takes this
opportunity to remove the '\n' character at the end of messages since it
is automatically added by netdev_* log helpers.
Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igc/igc_ptp.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index f99c514ad0f4..c292aaf7c79d 100644
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -466,7 +466,7 @@ void igc_ptp_tx_hang(struct igc_adapter *adapter)
* interrupt
*/
rd32(IGC_TXSTMPH);
- dev_warn(&adapter->pdev->dev, "clearing Tx timestamp hang\n");
+ netdev_warn(adapter->netdev, "Clearing Tx timestamp hang");
}
}
@@ -529,7 +529,7 @@ static void igc_ptp_tx_work(struct work_struct *work)
* interrupt
*/
rd32(IGC_TXSTMPH);
- dev_warn(&adapter->pdev->dev, "clearing Tx timestamp hang\n");
+ netdev_warn(adapter->netdev, "Clearing Tx timestamp hang");
return;
}
@@ -626,10 +626,9 @@ void igc_ptp_init(struct igc_adapter *adapter)
&adapter->pdev->dev);
if (IS_ERR(adapter->ptp_clock)) {
adapter->ptp_clock = NULL;
- dev_err(&adapter->pdev->dev, "ptp_clock_register failed\n");
+ netdev_err(netdev, "ptp_clock_register failed");
} else if (adapter->ptp_clock) {
- dev_info(&adapter->pdev->dev, "added PHC on %s\n",
- adapter->netdev->name);
+ netdev_info(netdev, "PHC added");
adapter->ptp_flags |= IGC_PTP_ENABLED;
}
}
@@ -666,8 +665,7 @@ void igc_ptp_stop(struct igc_adapter *adapter)
if (adapter->ptp_clock) {
ptp_clock_unregister(adapter->ptp_clock);
- dev_info(&adapter->pdev->dev, "removed PHC on %s\n",
- adapter->netdev->name);
+ netdev_info(adapter->netdev, "PHC removed");
adapter->ptp_flags &= ~IGC_PTP_ENABLED;
}
}
--
2.25.3
next prev parent reply other threads:[~2020-04-20 23:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-20 23:43 [net-next 00/13][pull request] 1GbE Intel Wired LAN Driver Updates 2020-04-20 Jeff Kirsher
2020-04-20 23:43 ` [net-next 01/13] igc: Add ECN support for TSO Jeff Kirsher
2020-04-20 23:43 ` [net-next 02/13] igc: Use netdev log helpers in igc_main.c Jeff Kirsher
2020-04-21 17:39 ` Jakub Kicinski
2020-04-21 19:26 ` David Miller
2020-04-21 21:09 ` Andre Guedes
2020-04-21 22:32 ` David Miller
2020-04-21 22:48 ` Andre Guedes
2020-04-20 23:43 ` [net-next 03/13] igc: add support to interrupt, eeprom, registers and link self-tests Jeff Kirsher
2020-04-21 17:48 ` Jakub Kicinski
2020-04-20 23:43 ` [net-next 04/13] igc: Use netdev log helpers in igc_ethtool.c Jeff Kirsher
2020-04-20 23:43 ` Jeff Kirsher [this message]
2020-04-20 23:43 ` [net-next 06/13] igc: Use netdev log helpers in igc_dump.c Jeff Kirsher
2020-04-20 23:43 ` [net-next 07/13] igc: Use netdev log helpers in igc_base.c Jeff Kirsher
2020-04-20 23:43 ` [net-next 08/13] igc: Remove '\n' from log strings in igc_i225.c Jeff Kirsher
2020-04-20 23:43 ` [net-next 09/13] igc: Remove '\n' from log strings in igc_mac.c Jeff Kirsher
2020-04-20 23:43 ` [net-next 10/13] igc: Remove '\n' from log messages in igc_nvm.c Jeff Kirsher
2020-04-20 23:43 ` [net-next 11/13] igc: Remove '\n' from log strings in igc_phy.c Jeff Kirsher
2020-04-20 23:43 ` [net-next 12/13] igc: Remove unneeded definition Jeff Kirsher
2020-04-20 23:43 ` [net-next 13/13] igc: Remove unneeded register Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200420234313.2184282-6-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=aaron.f.brown@intel.com \
--cc=andre.guedes@intel.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).