From: Ruud Bos <kernel.hbk@gmail.com>
To: netdev@vger.kernel.org
Cc: richardcochran@gmail.com, davem@davemloft.net, kuba@kernel.org,
jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com,
Ruud Bos <kernel.hbk@gmail.com>
Subject: [PATCH net-next 1/4] igb: move SDP config initialization to separate function
Date: Wed, 6 Oct 2021 14:58:22 +0200 [thread overview]
Message-ID: <20211006125825.1383-2-kernel.hbk@gmail.com> (raw)
In-Reply-To: <20211006125825.1383-1-kernel.hbk@gmail.com>
Allow reuse of SDP config struct initialization by moving it to a
separate function.
Signed-off-by: Ruud Bos <kernel.hbk@gmail.com>
---
drivers/net/ethernet/intel/igb/igb_ptp.c | 27 +++++++++++++++++-------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index 0011b15e678c..c78d0c2a5341 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -69,6 +69,7 @@
#define IGB_NBITS_82580 40
static void igb_ptp_tx_hwtstamp(struct igb_adapter *adapter);
+static void igb_ptp_sdp_init(struct igb_adapter *adapter);
/* SYSTIM read access for the 82576 */
static u64 igb_ptp_read_82576(const struct cyclecounter *cc)
@@ -1192,7 +1193,6 @@ void igb_ptp_init(struct igb_adapter *adapter)
{
struct e1000_hw *hw = &adapter->hw;
struct net_device *netdev = adapter->netdev;
- int i;
switch (hw->mac.type) {
case e1000_82576:
@@ -1233,13 +1233,7 @@ void igb_ptp_init(struct igb_adapter *adapter)
break;
case e1000_i210:
case e1000_i211:
- for (i = 0; i < IGB_N_SDP; i++) {
- struct ptp_pin_desc *ppd = &adapter->sdp_config[i];
-
- snprintf(ppd->name, sizeof(ppd->name), "SDP%d", i);
- ppd->index = i;
- ppd->func = PTP_PF_NONE;
- }
+ igb_ptp_sdp_init(adapter);
snprintf(adapter->ptp_caps.name, 16, "%pm", netdev->dev_addr);
adapter->ptp_caps.owner = THIS_MODULE;
adapter->ptp_caps.max_adj = 62499999;
@@ -1284,6 +1278,23 @@ void igb_ptp_init(struct igb_adapter *adapter)
}
}
+/**
+ * igb_ptp_sdp_init - utility function which inits the SDP config structs
+ * @adapter: Board private structure.
+ **/
+void igb_ptp_sdp_init(struct igb_adapter *adapter)
+{
+ int i;
+
+ for (i = 0; i < IGB_N_SDP; i++) {
+ struct ptp_pin_desc *ppd = &adapter->sdp_config[i];
+
+ snprintf(ppd->name, sizeof(ppd->name), "SDP%d", i);
+ ppd->index = i;
+ ppd->func = PTP_PF_NONE;
+ }
+}
+
/**
* igb_ptp_suspend - Disable PTP work items and prepare for suspend
* @adapter: Board private structure
--
2.30.2
next prev parent reply other threads:[~2021-10-06 13:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 12:58 [PATCH net-next 0/4] igb: support PEROUT and EXTTS PTP pin functions on 82580/i354/i350 Ruud Bos
2021-10-06 12:58 ` Ruud Bos [this message]
2021-10-06 12:58 ` [PATCH net-next 2/4] igb: move PEROUT and EXTTS isr logic to separate functions Ruud Bos
2021-10-06 12:58 ` [PATCH net-next 3/4] igb: support PEROUT on 82580/i354/i350 Ruud Bos
2021-10-06 12:58 ` [PATCH net-next 4/4] support EXTTS " Ruud Bos
2021-10-06 13:09 ` [PATCH net-next 0/4] igb: support PEROUT and EXTTS PTP pin functions " Ruud Bos
2021-10-12 15:43 ` Ruud Bos
2021-10-12 15:49 ` Jakub Kicinski
2021-10-12 15:53 ` Nguyen, Anthony L
-- strict thread matches above, loose matches on Subject: below --
2021-12-29 18:40 [PATCH net-next 0/4][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-29 Tony Nguyen
2021-12-29 18:40 ` [PATCH net-next 1/4] igb: move SDP config initialization to separate function Tony Nguyen
2021-07-19 6:25 Ruud Bos
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=20211006125825.1383-2-kernel.hbk@gmail.com \
--to=kernel.hbk@gmail.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=jesse.brandeburg@intel.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.