Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754070AbdLOHfg (ORCPT ); Fri, 15 Dec 2017 02:35:36 -0500 Received: from mga06.intel.com ([134.134.136.31]:56932 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753694AbdLOHf1 (ORCPT ); Fri, 15 Dec 2017 02:35:27 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,403,1508828400"; d="scan'208";a="158949233" From: Sagar Arun Kamble To: linux-kernel@vger.kernel.org Cc: Sagar Arun Kamble , Richard Cochran , Ariel Elior , everest-linux-l2@cavium.com, netdev@vger.kernel.org Subject: [PATCH 06/27] bnx2x: Use timecounter_initialize interface Date: Fri, 15 Dec 2017 13:08:21 +0530 Message-Id: <1513323522-15021-7-git-send-email-sagar.a.kamble@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1513323522-15021-1-git-send-email-sagar.a.kamble@intel.com> References: <1513323522-15021-1-git-send-email-sagar.a.kamble@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1767 Lines: 52 With new interface timecounter_initialize we can initialize timecounter fields and underlying cyclecounter together. Update bnx2x timecounter init with this new function. Signed-off-by: Sagar Arun Kamble Cc: Richard Cochran Cc: Ariel Elior Cc: everest-linux-l2@cavium.com Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 83624ad..1e10a81 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -15269,15 +15269,6 @@ static u64 bnx2x_cyclecounter_read(const struct cyclecounter *cc) return phc_cycles; } -static void bnx2x_init_cyclecounter(struct cyclecounter *cc) -{ - memset(cc, 0, sizeof(*cc)); - cc->read = bnx2x_cyclecounter_read; - cc->mask = CYCLECOUNTER_MASK(64); - cc->shift = 0; - cc->mult = 1; -} - static int bnx2x_send_reset_timesync_ramrod(struct bnx2x *bp) { struct bnx2x_func_state_params func_params = {NULL}; @@ -15511,9 +15502,12 @@ void bnx2x_init_ptp(struct bnx2x *bp) * unload / load (e.g. MTU change) while it is running. */ if (!bp->timecounter_init_done) { - bnx2x_init_cyclecounter(&bp->timecounter.cc); - timecounter_init(&bp->timecounter, - ktime_to_ns(ktime_get_real())); + timecounter_initialize(&bp->timecounter, + bnx2x_cyclecounter_read, + CYCLECOUNTER_MASK(64), + 1, + 0, + ktime_to_ns(ktime_get_real())); bp->timecounter_init_done = 1; } -- 1.9.1