Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3117930ybi; Thu, 18 Jul 2019 21:22:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqyRnHdYdgxgqgKzDXbhivdRp2CPODPJ18bRVzUWWz5epHBmagXSzRAiZyzGwuFg6+rFf1P7 X-Received: by 2002:a17:902:24a2:: with SMTP id w31mr55639530pla.324.1563510146229; Thu, 18 Jul 2019 21:22:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563510146; cv=none; d=google.com; s=arc-20160816; b=tJb+YlFO/tOlMu+HOvZLP34IUD0NiJiyDJNlbmeHGkJR21l00mdkPgZCR+7tpoFMQE WYhsQuXImt9XtQw8vnRg/5thO/Ag/ih1rQrlV9TVeQXr4U34DOCM5ZF7TT5yQ3BYZlhX OQJqQggoTvkiJau8/FET/nWdCNvhBKuXVVeuhSfH3bfrAYJl9SIRJtuwDdXj7Lb7oU4v 1zTEqCOLiWlvicpsccrpizMlogkQPwvzQHUtvmzsFFFrA1fh7wUMf3KRpTYf4pagixuo LUCarLyZXc1lVb8PM2kzeP1cV/8AgpVONd2CT5C7Rv+TKCtJTtiHmYoh2HxzZpLEQLek 8wcg== 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=KwR+PT+5Es/s1odNr/0CIXqczxRVdVBHqobw3A5M8UA=; b=w6DctYp7JmDkrn9uunMVfpKRezhvpYhx4wfm5LGEyF+ZvdWN3E4EZLZMuYCJNVWZwQ h79RgoJElWDhOznHC66ftXNlbOkjplPcDL4g94Rh/Nnw1SFJxRYLiKQ0q3J9JBEmykYc cWuKLxTJjbfljfUPRGyWk6FN7LAIP1FyxohqT8b1lVYqeDAK5s+Gde1b/OkzO2urAuYR IxUZtBHTl/YRavvLRPl+UBG8tGj2xzKuK6VmfyjHBkNOkLJ0k1rdPUemadeVSD7Rv9TH +WzyUZlO53CVX43UK95NAqfBWKO7d7Aj+cdau8+trmy0WziqVMH5PmD3+dAsaLKK1/La EG8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GwqaWFun; 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 a21si381337pgv.185.2019.07.18.21.22.11; Thu, 18 Jul 2019 21:22:26 -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=GwqaWFun; 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 S2388800AbfGSET5 (ORCPT + 99 others); Fri, 19 Jul 2019 00:19:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:48394 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388223AbfGSEMv (ORCPT ); Fri, 19 Jul 2019 00:12:51 -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 A6606218D4; Fri, 19 Jul 2019 04:12:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509571; bh=uDexvjbjNcUsM9NywNHmASlS28zuNCaffm46xWjs7TI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GwqaWFunhKPQ3e0s8ZO3L6qZA9fAzBSVtjOfa097Fe0xDhHObC7RInnYeEyDHIbLZ zZ+zaudYbNbDvzsSyG9C6eHK6H/UmOidPZTVPMWmX7LD4Ufhp7zNSznBsVYjyotpHe NkJ8mg7WXSmlfu4Z4UUJx4LsjsDvrIyMxDIXu4FM= 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 4.14 54/60] sh: prevent warnings when using iounmap Date: Fri, 19 Jul 2019 00:11:03 -0400 Message-Id: <20190719041109.18262-54-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719041109.18262-1-sashal@kernel.org> References: <20190719041109.18262-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 98cb8c802b1a..0ae60d680000 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -371,7 +371,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