From patchwork Fri Jan 2 19:22:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 425038 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3A8DA14010F for ; Sat, 3 Jan 2015 06:22:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752153AbbABTWZ (ORCPT ); Fri, 2 Jan 2015 14:22:25 -0500 Received: from mail-we0-f175.google.com ([74.125.82.175]:47804 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752082AbbABTWT (ORCPT ); Fri, 2 Jan 2015 14:22:19 -0500 Received: by mail-we0-f175.google.com with SMTP id k11so4794995wes.6 for ; Fri, 02 Jan 2015 11:22:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=k/2tEaHJLTLT0OtUgfPYuNSQyKjS1fhhqVLpMINDnmI=; b=YtUEFA35x9CwsUW/qA7qp4RApU1DNYvh+usYl7j3lDbRrGiyx1o27RvPxlv0Zy8h1h s+veFsGB/SJ2w5GgsFc2dMWIjGyODfvsGlns5+CxUHGuSjQ7zbxZxSZZTn11Z0tPeGQo YidnhoP1Jick6sx52htBYaG10ubdnRld/zQsCZVIT5U/uzVNq/7AvkPVcPn9CqsmWUSq RgOPL6WvFczAy6HYb1z0X0RfNLEmd2u+9RvyXJD0Fv1Vm5OHi9Ah2MvvHqtGLKrcvat9 WRmEsPiIyUqlFFLzqqtWCbtl60zhrhjwLAkoknUl4C62Ddtod8ehkLMKX3Z0Z0vEv0oH YJdQ== X-Received: by 10.180.97.196 with SMTP id ec4mr318355wib.71.1420226538174; Fri, 02 Jan 2015 11:22:18 -0800 (PST) Received: from hoboy.home (194-166-231-149.adsl.highway.telekom.at. [194.166.231.149]) by mx.google.com with ESMTPSA id f7sm134627wiz.13.2015.01.02.11.22.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jan 2015 11:22:17 -0800 (PST) From: Richard Cochran To: Cc: David Miller , John Stultz Subject: [PATCH net-next V2 4/7] igb: convert to CYCLECOUNTER_MASK macro. Date: Fri, 2 Jan 2015 20:22:06 +0100 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20141231.183347.862533634176009078.davem@davemloft.net> References: <20141231.183347.862533634176009078.davem@davemloft.net> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Richard Cochran --- drivers/net/ethernet/intel/igb/igb_ptp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c index 8baf3fd..5e7a4e3 100644 --- a/drivers/net/ethernet/intel/igb/igb_ptp.c +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c @@ -19,7 +19,6 @@ #include #include #include -#include #include "igb.h" @@ -766,7 +765,7 @@ void igb_ptp_init(struct igb_adapter *adapter) adapter->ptp_caps.settime = igb_ptp_settime_82576; adapter->ptp_caps.enable = igb_ptp_feature_enable; adapter->cc.read = igb_ptp_read_82576; - adapter->cc.mask = CLOCKSOURCE_MASK(64); + adapter->cc.mask = CYCLECOUNTER_MASK(64); adapter->cc.mult = 1; adapter->cc.shift = IGB_82576_TSYNC_SHIFT; /* Dial the nominal frequency. */ @@ -786,7 +785,7 @@ void igb_ptp_init(struct igb_adapter *adapter) adapter->ptp_caps.settime = igb_ptp_settime_82576; adapter->ptp_caps.enable = igb_ptp_feature_enable; adapter->cc.read = igb_ptp_read_82580; - adapter->cc.mask = CLOCKSOURCE_MASK(IGB_NBITS_82580); + adapter->cc.mask = CYCLECOUNTER_MASK(IGB_NBITS_82580); adapter->cc.mult = 1; adapter->cc.shift = 0; /* Enable the timer functions by clearing bit 31. */