From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FE29C282D7 for ; Mon, 11 Feb 2019 12:27:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EDCD82075B for ; Mon, 11 Feb 2019 12:27:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="n6RxpTGQ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="SXI6KFH/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EDCD82075B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dBlqx6zfl4OrHFa9wH905Yd5FHHYlnVFQAmtZEYYo9A=; b=n6RxpTGQz5iSw6 8n2ZQSiSdtGls+CvUv1VsX+8hhIwM71Ts/FJcbd0U3NhNVcdodifF/qFjxe3NDzMVs4UdPqhr0UM6 EQPH0kmaTWuziX3Jo4s5QzdpIKlOtlwAsGCArHU845T/BkLj405UAcvuKs66TXU8YB39JQfkUiDVQ 4/Hpy0ngATs+AHRWtyL5vHYlfeGVXy2ggnejFm3uLriXStD7CrPBluXT72yADYnr0/XNO9/XtHu8K WtTQpJOOaZhn1KB7eynqBIOzIZrbLZst9W9at0NEOTSkysuPOtyPjAbYa90Q4oSHCeIkPEpproro3 XV1MBY0HAzR9HqRqY7nA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtAgS-00008k-QF; Mon, 11 Feb 2019 12:27:36 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtAfF-0007EA-N0 for linux-arm-kernel@lists.infradead.org; Mon, 11 Feb 2019 12:26:31 +0000 Received: by mail-wr1-x443.google.com with SMTP id v16so4440805wrn.11 for ; Mon, 11 Feb 2019 04:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d84vosy0hzSE9kDbqRdSCRCT4mvEWw1x9RCjfQ9bpew=; b=SXI6KFH/twIrzqjmE7k/SrAQKeGX46c+TAbRieThkTE5FgLtRAcdArt6yoOKsL+XbK L+6DOt5wfwZiOnDZd7RCZygXXNv7B8eC1HqVuM4HU3Om6+yaj3Xf4AGBns6eDakzmUpC 7VfySyu0nkZvDMJh8nu1KYtEG8/t55pp3kwvzWX4WbSGAJ0I6yCrWvZLQdGfWOA7o/WL ivSeuijqvh238EWa9Jnx6GnEc3sJgCXImwxZv13ml/trtY3aP6HAxbSStSv/VjfVZGFo jVvK/hkrMcvoQn8gfbNIiFuHomOTofoHjzwOIEqd0FkV/2PxupDQg5JA/10EnXirAcvd bXGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d84vosy0hzSE9kDbqRdSCRCT4mvEWw1x9RCjfQ9bpew=; b=joizxuEQHGgUPnz++E8agVydybPdQZvzvZPxkhFQtY/ySXaa1fr59ya1poGJwBeuE/ egr8VofHyD6I8iLu3QaCmb3WAcP+DDfLMTadIHRIYTqrzqDywcYYbao9oH7JilWFajlb BR7TdOFlOgtgYhp2RH5c86iYwPTpCR3WZ6KrkeKJPe2sLVSmPONC37lOal5zPrJZBYlb aVJikszNjcMMJwpsz2NaMU9zIcSN8A+5uYL1t2qM4s5w/c4cLK+xofvU9KHPrEX1Miw+ bxBbQwciLvlG27H2pkOoU4Okhw+pe/YMymW1VnSm5OCn3y4f82K0f0D3NAW4ZuPFkxn6 ToyA== X-Gm-Message-State: AHQUAuZecXmDzy2/jKnWzbIUmmwqMojMxHBveb28r2i0Ag/1rHu+Fo9A xK1+OA9IsC5P5+JdPEyrX2WO4g== X-Google-Smtp-Source: AHgI3IZv0+aj5jt6+lgppUcuQTLdUhV/8UqD0EBRknE0NAr6RlWZyg33cx5DBwF/ifwwScNW6bO0Og== X-Received: by 2002:adf:f848:: with SMTP id d8mr29154975wrq.178.1549887979554; Mon, 11 Feb 2019 04:26:19 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id l20sm19494321wrb.93.2019.02.11.04.26.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Feb 2019 04:26:18 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier , David Lechner Subject: [RESEND PATCH v2 05/33] ARM: davinci: pull davinci_intc_base into the respective intc drivers Date: Mon, 11 Feb 2019 13:25:38 +0100 Message-Id: <20190211122606.8662-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211122606.8662-1-brgl@bgdev.pl> References: <20190211122606.8662-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190211_042622_090388_BE13A7FF X-CRM114-Status: GOOD ( 13.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Bartosz Golaszewski davinci_intc_base is defined globally in common.c. Define separate local variables for the aintc and cp-intc drivers and remove the global one. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/common.c | 2 -- arch/arm/mach-davinci/cp_intc.c | 2 ++ arch/arm/mach-davinci/include/mach/common.h | 1 - arch/arm/mach-davinci/irq.c | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index a87e158a709b..2850ae02aaa4 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -23,8 +23,6 @@ struct davinci_soc_info davinci_soc_info; EXPORT_SYMBOL(davinci_soc_info); -void __iomem *davinci_intc_base; - void davinci_get_mac_addr(struct nvmem_device *nvmem, void *context) { char *mac_addr = davinci_soc_info.emac_pdata->mac_addr; diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 19874f5ef542..4e293cde20fb 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -26,6 +26,8 @@ #define DAVINCI_CP_INTC_PRI_INDX_MASK GENMASK(9, 0) #define DAVINCI_CP_INTC_GPIR_NONE BIT(31) +static void __iomem *davinci_intc_base; + static inline unsigned int cp_intc_read(unsigned offset) { return __raw_readl(davinci_intc_base + offset); diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 34e48de92dcc..3d45b73b9a64 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -20,7 +20,6 @@ void davinci_timer_init(struct clk *clk); extern void davinci_irq_init(void); -extern void __iomem *davinci_intc_base; struct davinci_timer_instance { u32 base; diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 2494d9b36966..19f17ef04381 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -43,6 +43,7 @@ #define IRQ_INTPRI0_REG_OFFSET 0x0030 #define IRQ_INTPRI7_REG_OFFSET 0x004C +static void __iomem *davinci_intc_base; static struct irq_domain *davinci_irq_domain; static inline void davinci_irq_writel(unsigned long value, int offset) -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel