From patchwork Tue Feb 20 11:54:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 875508 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zlzph1sMVz9ryf for ; Tue, 20 Feb 2018 23:05:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751708AbeBTL6A (ORCPT ); Tue, 20 Feb 2018 06:58:00 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:58945 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751678AbeBTL55 (ORCPT ); Tue, 20 Feb 2018 06:57:57 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0M4a7A-1eXohK31Se-00yivB; Tue, 20 Feb 2018 12:57:54 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Cc: Greg KH , linux-kernel@vger.kernel.org, Arnd Bergmann , Karsten Keil , netdev@vger.kernel.org Subject: [4.4-stable 04/22] isdn: sc: work around type mismatch warning Date: Tue, 20 Feb 2018 12:54:51 +0100 Message-Id: <20180220115527.1806578-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180220115527.1806578-1-arnd@arndb.de> References: <20180220115527.1806578-1-arnd@arndb.de> X-Provags-ID: V03:K0:zIwe370LQLXA/9Kx1TyVFIRhjAMoHSQUdlpMtjs1cKFkA5yhYWn IPcY9t6RPE2MTSUkCeLYfwT2BBWYsBj7XJ0zaLh79Uk6ZtwKg+63v0J7iK7qlpzR9puF0se ivF4NTMCZ4xHNMoZV9jiVGk4lmPX1nlKnCf8uanfwhQWWIosQWooW6NfraPGvDhx6GKdTYW SWpc6noMgsNqKrYlBo1aQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:BsNSwTrm9U4=:/1B547Sw7qpdamF+dRgdp/ aRKswH94fMMoNIZkUQzqrzCc+i5exEZKVyZuCKWUBbg3cvDsAghripce3ZwJUzTQ/BbP/eflp N/L9so5bLiSvlpAclCP75gWs/EN22KBBz8/Gg2bksNJslQOJJkbc3i/wMyx5Y2oB5PeT4WYym TzRLJPgJIgzxA+mH+Du53Jugy9Vip/kzDKnzFdm14DQFiuHHwxEA1is6ikGFFs5Lzm6DRuwhw AqjVTlT3UPr1DucSqjIJCRj67/brD6vsKcSJrfMJkFHwH1qJ8oDH13g0iEaMgPNGQRbsNT6Tf VRPeDc8n/MVqz2JpiJj99NwMB7uq+K4OkDRRthJNweTnyBPtv8vsFt+/MlkBbdRiSbUFcekpS JK8kKoAEQ0mh3GfOYmorUxUg5Q7CbmnIWsnvR1e4NHLorAxLxD6shQ8uPHu09FC6916RuxN9u H8kI5FfMYJa5MKJBdmVNOWg+IqYmAaVq4oDJsuT9Ew0MEVN10PM7vDoqymn2VFjeEaGnYiZF5 oDfU5nvKnt6GBwCbNC+W7jV55TLYCBjQfgZUjjSWc1QL4y35km14ufIyVXxieqeU8IwYK21LU WDmTTPnlo21O1l3pvz2i7EMh4aDq8O1L3I9WxUnb95KFZhKxmTAzvAGmYN0A9562CPu8I6sh6 MLTDRyYIUaP/2xIn4WDOJN9YjzEWCIDW+Bt8PAMcgWtPyf4M8gzAXo9Sog31g4k0el7yFmMQ6 AGTVm04snQSk6cTYYD7QqpI/0DmvdYuhQmisDA== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This driver shows warnings on many architectures: drivers/isdn/sc/init.c: In function 'identify_board': drivers/isdn/sc/init.c:484:2: error: passing argument 1 of 'readl' makes pointer from integer without a cast [-Werror] In newer kernels, it was completely removed, but for the 4.4-stable series, let's just shut up that warning by adding an extra variable to do the necessary type cast. Signed-off-by: Arnd Bergmann --- drivers/isdn/sc/init.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c index 3597ef47b28a..09fc129ef2fa 100644 --- a/drivers/isdn/sc/init.c +++ b/drivers/isdn/sc/init.c @@ -441,6 +441,7 @@ static int identify_board(unsigned long rambase, unsigned int iobase) RspMessage rcvmsg; ReqMessage sndmsg; HWConfig_pl hwci; + void __iomem *rambase_sig = (void __iomem *)rambase + SIG_OFFSET; int x; pr_debug("Attempting to identify adapter @ 0x%lx io 0x%x\n", @@ -481,7 +482,7 @@ static int identify_board(unsigned long rambase, unsigned int iobase) */ outb(PRI_BASEPG_VAL, pgport); msleep_interruptible(1000); - sig = readl(rambase + SIG_OFFSET); + sig = readl(rambase_sig); pr_debug("Looking for a signature, got 0x%lx\n", sig); if (sig == SIGNATURE) return PRI_BOARD; @@ -491,7 +492,7 @@ static int identify_board(unsigned long rambase, unsigned int iobase) */ outb(BRI_BASEPG_VAL, pgport); msleep_interruptible(1000); - sig = readl(rambase + SIG_OFFSET); + sig = readl(rambase_sig); pr_debug("Looking for a signature, got 0x%lx\n", sig); if (sig == SIGNATURE) return BRI_BOARD; @@ -501,7 +502,7 @@ static int identify_board(unsigned long rambase, unsigned int iobase) /* * Try to spot a card */ - sig = readl(rambase + SIG_OFFSET); + sig = readl(rambase_sig); pr_debug("Looking for a signature, got 0x%lx\n", sig); if (sig != SIGNATURE) return -1;