From patchwork Sun Jun 22 10:21:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Manuel_Sch=C3=B6lling?= X-Patchwork-Id: 362518 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 CA4E114001A for ; Sun, 22 Jun 2014 20:22:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751783AbaFVKWD (ORCPT ); Sun, 22 Jun 2014 06:22:03 -0400 Received: from mout.gmx.net ([212.227.15.19]:52899 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751570AbaFVKWB (ORCPT ); Sun, 22 Jun 2014 06:22:01 -0400 Received: from schoellingm.dzne.de ([109.43.3.59]) by mail.gmx.com (mrgmx003) with ESMTPSA (Nemesis) id 0Lhfu5-1WLBPQ48yf-00ms4P; Sun, 22 Jun 2014 12:21:51 +0200 From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= To: michal.simek@xilinx.com Cc: anirudh@xilinx.com, John.Linn@xilinx.com, davem@davemloft.net, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Manuel=20Sch=C3=B6lling?= Subject: [PATCH] xilinx: Fix compiler warning Date: Sun, 22 Jun 2014 12:21:01 +0200 Message-Id: <1403432461-18296-1-git-send-email-manuel.schoelling@gmx.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Provags-ID: V03:K0:90eigVzhjJmcve+34tusurv0BWv57ho5e+AuxQ1/PH00HW/Qi7l rc9tYF50f7ZW6mDMbQV8DC6wSNhejK4p6hxj2JQQTbNSD7l0nNL7MJ0aqAzNPa+wGcXOWlP NZ2ykPoduDsp4NRDXyufHnsBaldzE86pgAmRZqD1cC3VHRGMcH53+j2A7a40QiysdroQBSb irxtZ3CK76orUYEiGZ6wg== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The time comparsion functions require arguments of type unsigned long instead of (signed) long. Signed-off-by: Manuel Schölling --- 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 +- init/do_mounts.c | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 4ef818a..8a6e5c2 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 d4abf47..3b67d60 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 8c4aed3..782bb93 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c @@ -695,7 +695,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. diff --git a/init/do_mounts.c b/init/do_mounts.c index 60c4196..2d069a3 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -351,7 +351,6 @@ static void __init get_fs_names(char *page) continue; line++; - /* append fsname */ memmove(fsnames, line, strlen(line)+1); fsnames += strlen(fsnames)+1; } while (page != NULL);