From patchwork Fri May 5 19:47:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98695 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292861qge; Fri, 5 May 2017 12:48:45 -0700 (PDT) X-Received: by 10.84.241.77 with SMTP id u13mr7151930plm.28.1494013725287; Fri, 05 May 2017 12:48:45 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.45; Fri, 05 May 2017 12:48:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755753AbdEETsj (ORCPT + 6 others); Fri, 5 May 2017 15:48:39 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:50153 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755587AbdEETsd (ORCPT ); Fri, 5 May 2017 15:48:33 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MWKgT-1dZYeC2W4H-00XJv2; Fri, 05 May 2017 21:48:21 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, =?utf-8?q?Manuel_Sch=C3=B6lling?= , "David S . Miller" , Arnd Bergmann Subject: [PATCH 3.16-stable 44/87] xilinx: Fix compiler warning Date: Fri, 5 May 2017 21:47:02 +0200 Message-Id: <20170505194745.3627137-45-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:h74LyHSPKh2F6d85+FREwI7ludyiwRbstYkoGRMPOIEfS9wkivx QjD7mzpoNKgNtvLy5bsrh5czqvAPbm3dPJlLLs1N2Cc7L9X6HC576NhqShX+rd1UUqrDAde DzY8ggCc+rFV2a4M1uaa/blP7Pa5QOXEIk7u1BCCyZbC4r2PQ4JBQiu4kTXfSF9JvmSilfB Osyxrydfgl629g51tQigw== X-UI-Out-Filterresults: notjunk:1; V01:K0:ubrB5mNvrgA=:DzG2ocG/o+o1mt11NWp5Bu bcacTBe3/zPq46Img8dHfaFZylHahHnAuj106DEDXkxvJAEFpNA3Z0alEuGFvqi0ebRm60qyl nLcHXg1Kn5bPnvMNtCW2ErsVn7kVY1agbf+dcoh1FoxSSz2aD+mV4K6yVpkAIbQIe5yALmTld AFOjv4GIgW+xA7AKd+XY1/S7X/X1fEPJwIr+hXAuYts56yQ2f9qsenYf4y2dfhctRiG7KRI66 QB8xZap0BJKwoZ5wMpwCP2wxwhdSWyJS5r7RI67H9Xr93Zi++J34Xr0bhSj9OCqHTTHBvtHUQ my6XZlCwA3Nn1GbtF86wYaoAe1K4elRZpU6ryUct8jPVFo4WFzGFSdastQdeuR0BUthdCoEE5 V2AqAsc2y/aG9TdC9gCGEDKWEi38snzrwzf8ax/KfuoLV7mRAbp1w+vFE8lRHilhdYDOsGeT7 OvJtkRxVBfDH+zl32vDr7X7UaleEsg6bc2+MZo0M20S0PPRKi00/H31jfZVbgmAoYfzQHCD3v jbPiP3y/V5GnGmEtRVytFLHgGAhOQOQkWkoabTj7HxwsAwaNvSrLtBjVRNYVd1dUds0D3SOA+ 8Bsnl3a/WQhFLCMjI2BJAlKdYeD0Zx8a9/68HCUWvAMuh8/pBgUcIYO+xMXelEFq+wziGiPm2 u0XoWCV2HM1Pxci+LwE3kEWFO23flbqI0m7fYc2TdG/9GtFHtey/4a3AlMgivCL1T/fhcEU4k qh74R7RNHBE+uh0g Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Manuel Schölling Commit b2daccdc2f728b20850bffbe4e22241dfc2dca59 upstream. The time comparsion functions require arguments of type unsigned long instead of (signed) long. Signed-off-by: Manuel Schölling Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 4ef818a7a6c6..8a6e5c2d6f95 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -72,7 +72,7 @@ void temac_iow(struct temac_local *lp, int offset, u32 value) int temac_indirect_busywait(struct temac_local *lp) { - long end = jiffies + 2; + unsigned long end = jiffies + 2; while (!(temac_ior(lp, XTE_RDY0_OFFSET) & XTE_RDY0_HARD_ACS_RDY_MASK)) { if (time_before_eq(end, jiffies)) { diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c index d4abf478e2bb..3b67d60d4378 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c @@ -19,7 +19,7 @@ /* Wait till MDIO interface is ready to accept a new transaction.*/ int axienet_mdio_wait_until_ready(struct axienet_local *lp) { - long end = jiffies + 2; + unsigned long end = jiffies + 2; while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) & XAE_MDIO_MCR_READY_MASK)) { if (time_before_eq(end, jiffies)) { diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 06b5e4132040..af36c7b560df 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c @@ -707,7 +707,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id) static int xemaclite_mdio_wait(struct net_local *lp) { - long end = jiffies + 2; + unsigned long end = jiffies + 2; /* wait for the MDIO interface to not be busy or timeout after some time.