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: 128873 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4553305ljc; Tue, 20 Feb 2018 03:58:05 -0800 (PST) X-Google-Smtp-Source: AH8x227iMl55QjKjKqyn9qqV/IJt4fcxlOqcPmIhK3sTH35dE4albQrYzysAWvtMCqWS7mMF61NJ X-Received: by 2002:a17:902:2bc5:: with SMTP id l63-v6mr17522232plb.108.1519127885712; Tue, 20 Feb 2018 03:58:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519127885; cv=none; d=google.com; s=arc-20160816; b=Um/7WFxKcPTPeSqJ6vgvTGHlhdnlhVZIO2HSxYs/hh767oF72s6GJyXbahIPijhZGK gjNM63YqgFRZv8PD/f3rT5p9aR5wioRpX3qszUFkQxx4Jj/RVRONGLbJ5sXx63m17rR6 Nt716xro8MHIh0i8c1Iyd/NjkmxD0JuvjrT45Ph2q9mHqoU5hosc04Phfu2A7sgSvkTc pckI67TBLypi/7F+vGMtWDsyBWIuc3HpzblWruCiayqXwElXEJpKHgh3s237n/XdeQWF 9fuRHKExhd3Js4StpIAyjYR3YbRXqKmg143HyydUXHe559KrmbEf7TMG4ANRuzb8CA+8 nwRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Fl7fdk2G+f0AMLPfy21mEwUJ81kbdXfmKKtoeRJptLo=; b=f5r9ng8buJ3D3XlsDPdA3z512vz6Z6NgQtgm97nNh1Mq+TEGNEUAg0VdObdDoKX/hQ +JjZAGzWSEWf4bcMR83LZ1snLf2laB7MwcPrJxvA57bI4zpD+dBA9Pi0tr4f9PL8cnPZ iTv5EXcM8FkQLEVmlgqwlBY0TqaxjW0TOYvwDyHS7KW5OHgTSvodu6OUQlyP+uoxlVDP Yyz52iQle4p11CcxpCvZeRlCpHY5m1ajlybDLK3jYj1f8pbRbC9MjKhVjkTqox53eo27 4jgp2076AnUHMB2o5v3FGCTyzBky8Z/5zl2Lsa5i6bxhJx2lWGNmphpdCsnzKpOYwDXC DLvw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e9si4976682pga.146.2018.02.20.03.58.05; Tue, 20 Feb 2018 03:58:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751726AbeBTL6B (ORCPT + 28 others); Tue, 20 Feb 2018 06:58:01 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) -- 2.9.0 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;