Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3123254ybi; Thu, 18 Jul 2019 21:29:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwPQabYVgE/qd/2bxUDm+UYBQK7x/1/BNIIAw1Z6mVYWDdtHGnLZxPKWwYe3seN4+I91cZJ X-Received: by 2002:a17:902:da4:: with SMTP id 33mr49855615plv.209.1563510555066; Thu, 18 Jul 2019 21:29:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563510555; cv=none; d=google.com; s=arc-20160816; b=hNvHmr0m9Q7mhrZysrpN91ADmw7irlncyX8Cn5BNUboFYVNpqAFuNregmFc23dipPG aJSge9rAkGiVGs5MzEMgshu9C+onX5noDM6xylMKEgTzmb39lTvOJPAqFBitNCeom4av Z/xmLAYPUdHY69JEaZNip13fV1FKrFqqHMDdAaqBZcQAmpl3V4NFrYPmjdAPaDn6ncCx M6xzVVu8S6ZnhooSeSRrS+qi6At63Sf907uK/pLMSDWuj//SYefznkYOyRvbFSypXN/A NGxU1Xr78KGWO2AXAZ1APzb3kL9LYU9r56qWMQ95Sq1AO7EKPUH4eF6VHSuhNx/hrE7G ZpSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vQpE0YmOGBSrreqDKffzkPaoRG532yJmngn+1BAvP5A=; b=xAFVy5bGKY6KVwN6UdcAzkSV77XXpDG/h5iK6FVqaxyRfK+2hlixCgNpBzd21PkhtV vHrCFr3nS7uEwBROa1UfEloHTJWRjTpzWoY/GEWtRd+luROLj5PHwgmR51GY0qJoGAjs 7YOs99keKgubDWuSxrRMDQNKeE23jiOP9RdJNsmE1EOmZeIUN+ClyQmz381spjzYJxKe Pc7qSGCVNQv6ffjYy5mseNcIidCtE2TguVu4nHcNpa9dAo83B+ToUbiCnt3ueIXC2ZD3 +pUEh0Ge2Q3vrwwtQTW+X3GnXadqh7pUQPU9DeBtjpixfguMbJJgs1DJsRO8j12HdB/R +zPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NVyp2EBx; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 21si1539666pfo.138.2019.07.18.21.29.00; Thu, 18 Jul 2019 21:29:15 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=NVyp2EBx; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733243AbfGSE1y (ORCPT + 99 others); Fri, 19 Jul 2019 00:27:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:39910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732317AbfGSEGn (ORCPT ); Fri, 19 Jul 2019 00:06:43 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0973521873; Fri, 19 Jul 2019 04:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509202; bh=U/GBf7j/Uede6weueNuWmo6ChEUdacNxhr9e3KCVK38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NVyp2EBx2a0my6SL1ma8u9hQcW9YzRBEwtgqpDikRrtYbCbMJR+RL1YYEZZ/eq8eT 3GrTT+Qb0JefrrQk0w/KvNZIhzhfVKMMvwgAKKIX6kEYCseNucY7YLfADn3QaxcRp6 SlcuYwzMCLdOgUJdN8ctjgy9AIRpejUQSsAl1V8Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sam Ravnborg , Geert Uytterhoeven , Yoshinori Sato , Rich Felker , Will Deacon , Mark Brown , Inki Dae , Krzysztof Kozlowski , Andrew Morton , Linus Torvalds , Sasha Levin , linux-sh@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 125/141] sh: prevent warnings when using iounmap Date: Fri, 19 Jul 2019 00:02:30 -0400 Message-Id: <20190719040246.15945-125-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719040246.15945-1-sashal@kernel.org> References: <20190719040246.15945-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sam Ravnborg [ Upstream commit 733f0025f0fb43e382b84db0930ae502099b7e62 ] When building drm/exynos for sh, as part of an allmodconfig build, the following warning triggered: exynos7_drm_decon.c: In function `decon_remove': exynos7_drm_decon.c:769:24: warning: unused variable `ctx' struct decon_context *ctx = dev_get_drvdata(&pdev->dev); The ctx variable is only used as argument to iounmap(). In sh - allmodconfig CONFIG_MMU is not defined so it ended up in: \#define __iounmap(addr) do { } while (0) \#define iounmap __iounmap Fix the warning by introducing a static inline function for iounmap. This is similar to several other architectures. Link: http://lkml.kernel.org/r/20190622114208.24427-1-sam@ravnborg.org Signed-off-by: Sam Ravnborg Reviewed-by: Geert Uytterhoeven Cc: Yoshinori Sato Cc: Rich Felker Cc: Will Deacon Cc: Mark Brown Cc: Inki Dae Cc: Krzysztof Kozlowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- arch/sh/include/asm/io.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 4f7f235f15f8..e01fbfdbc78c 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -372,7 +372,11 @@ static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; } #define ioremap_nocache ioremap #define ioremap_uc ioremap -#define iounmap __iounmap + +static inline void iounmap(void __iomem *addr) +{ + __iounmap(addr); +} /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem -- 2.20.1