From patchwork Mon Jul 22 11:47:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 169369 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp7422776ilk; Mon, 22 Jul 2019 04:47:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzuync/nmERsOkLZwh0ybJqrBoNWB1oUvDoaGeLR6P18FWU8xYD55PnuuwKq4uVxttqEscb X-Received: by 2002:a17:902:b688:: with SMTP id c8mr74027495pls.243.1563796055532; Mon, 22 Jul 2019 04:47:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563796055; cv=none; d=google.com; s=arc-20160816; b=XGLqcD0sXu00A/P/IkG/RRYuCDqS4vTjiiHDkO9mu1yEvSQZxrQpEQaw52/iSv19Un 0KO7dhcPtGx3aODC2sAZWG3xYJ8i1PDuLUZtFOXx5i/2ppKTE+IN91WmLYSHCOgthcFd 8qBGWOtjPNmwJEjzsPIJ4bLwjMaZb723tI0Qw5nScOxOkvL7LrMTT/S2tHW3gUr1ndH8 NOFTWA26efDUi7XCmHc2Diy7sWXMjw8vu07csw0V6x0zzQzVNURWcVTs91qKMSxMQvTI sTzi29xr7Iw7itOkWOWBkhTfIoVNWy6zbHexpz8PpGg6vdJrBxaVqAKX7v2t5wfxrMqt CPDQ== 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 :message-id:date:subject:cc:to:from; bh=Hhg/Wnj05t+l4ieGIyhT7mJhiRdsrc1mcq+tPoWHU1w=; b=dz1WeGwslKrj8gmQD8mNt/ja8ViNIazfbRW/BxkaFzLpC6j2O5V9vezKES3PooxAht A1Q8VhxM/8/AC46NSXVzXrE4rCA5QThUEI6vuzJI4h4eOxJfJZNscD7oy09ij12hbYbY J0/HsB06jdYGehTehMKqGtQRu3SW58VIpZxNejAgKc+4BvrGKNLABPxy0NkQFyWSyBsF eh7z0OJDgyLJ1lriazjzISFvF3RNfTUJ2BBggg0siKq9BFV9J12fx3JUhoSrpTm4zCrl eNUqxkFH6qHiWRYp69UyoBRqoAuBIxzP94N1rdClxV/YMtuQ3b+8EkO+kX1dQvL69M/I Xi5w== 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 t4si11672536pjr.31.2019.07.22.04.47.33; Mon, 22 Jul 2019 04:47:35 -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; 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 S1729983AbfGVLrb (ORCPT + 29 others); Mon, 22 Jul 2019 07:47:31 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:51719 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726339AbfGVLrb (ORCPT ); Mon, 22 Jul 2019 07:47:31 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.145]) with ESMTPA (Nemesis) id 1MHWzP-1hc2P93KOf-00DX7g; Mon, 22 Jul 2019 13:47:26 +0200 From: Arnd Bergmann To: Lee Jones Cc: Arnd Bergmann , Sekhar Nori , linux-kernel@vger.kernel.org Subject: [PATCH] [RESEND] mfd: davinci_voicecodec: remove pointless #include Date: Mon, 22 Jul 2019 13:47:13 +0200 Message-Id: <20190722114725.3398694-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:/16xgt8i29BbhJxdyDZduqZVqgprV72HOGHV/wBP1tKP4jlYRTc M9xASYFnLmx0JchXqh1NffsL09FPc4hehAQ4YH13Zs5rMR7lTWvDqe8bhJ8WmgE33DbivhH q+HDiifjhjYZAFAYX2vfIw8s8Js7XEUQX/r+oa4uXIWD6AQVFFqG2pLYcqZToDoHi64y/bk QR6RF/KcLTfyViQoxMNzw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:BWqPk7k3CEs=:PncGTVIO0Pea+WtDV2/Nb6 +Z4mR8C1Nwz1nZfmOEXIl8q5erwG1oDGHSvhbFBt6qD+sW5CoqDrQWtmQqhuFAvEfeFehU6Pv XFr/x0sLEq4DOngW+v7am/iGI8waafbqlqEnS4Ji24bsy/jLT9XzmBgTfnTJLnZIOSyxI2riy f4X9OG9tkC59lF5w5IWCNX2JHE0G9BWP9HXXtvOrEGPO/BirdtlnLQxPzfESDqtxE9ox96UOQ YGKbtILYlZ0EjPE7GgvHYiJDJonuUYdTIMekm/+utpXZBJBjNHIS5/uc7htVa7FRPNLWCs5Wk 2Owcd+1XHa662tJSNbymzEzxQEYiFznABxogozqR+Dp64pMO2ReEHpvyi+rpdOgNey8Lm1VcV dHvgNPiMlKyFlLg4RkPSDxKiczlCvYv37SlUowHetefi6Telp/PhhmQ3GOZVqhW/Zkt9tOn1Z pW21HK3KoZgzs9DWXhaQ11zai4yKAsN1/dThzG/uZorz92WpxS3UyvULv4BwtECnHTdJIhOMG wlMHdqpHkiDh8uHHOfAbdJfTFPF8v1mizUHz9xZRGedDJYne6VWFfsKTSF3hzxrGcBZQ2ayFP +mVA+rxHbmwNvDRYEBNTSG4OhRTec9wd2DdPVmuTmZk6THpnwiyDUY71UP0hyFyaA3c9lTW/X aeoPikr3kvT2uz44zNsQSmZSVfVSQkVwAB4rVGJAjvcdLn6o0NLQRBZIndm8fD5kcP5XMeZmH IElc95cTmSqQ8N35GG6gO+KzD+IMIfZ8GmWNaA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When building davinci as multiplatform, we get a build error in this file: drivers/mfd/davinci_voicecodec.c:22:10: fatal error: 'mach/hardware.h' file not found The header is only used to access the io_v2p() macro, but the result is already known because that comes from the resource a little bit earlier. Acked-by: Sekhar Nori Signed-off-by: Arnd Bergmann --- I sent this in June, but it did not get picked up into the mfd tree. Sending the same one again in case it got lost. --- drivers/mfd/davinci_voicecodec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.20.0 diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c index 13ca7203e193..e5c8bc998eb4 100644 --- a/drivers/mfd/davinci_voicecodec.c +++ b/drivers/mfd/davinci_voicecodec.c @@ -19,7 +19,6 @@ #include #include -#include static const struct regmap_config davinci_vc_regmap = { .reg_bits = 32, @@ -31,6 +30,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev) struct davinci_vc *davinci_vc; struct resource *res; struct mfd_cell *cell = NULL; + dma_addr_t fifo_base; int ret; davinci_vc = devm_kzalloc(&pdev->dev, @@ -48,6 +48,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + fifo_base = (dma_addr_t)res->start; davinci_vc->base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(davinci_vc->base)) { ret = PTR_ERR(davinci_vc->base); @@ -70,8 +71,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev) } davinci_vc->davinci_vcif.dma_tx_channel = res->start; - davinci_vc->davinci_vcif.dma_tx_addr = - (dma_addr_t)(io_v2p(davinci_vc->base) + DAVINCI_VC_WFIFO); + davinci_vc->davinci_vcif.dma_tx_addr = fifo_base + DAVINCI_VC_WFIFO; res = platform_get_resource(pdev, IORESOURCE_DMA, 1); if (!res) { @@ -81,8 +81,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev) } davinci_vc->davinci_vcif.dma_rx_channel = res->start; - davinci_vc->davinci_vcif.dma_rx_addr = - (dma_addr_t)(io_v2p(davinci_vc->base) + DAVINCI_VC_RFIFO); + davinci_vc->davinci_vcif.dma_rx_addr = fifo_base + DAVINCI_VC_RFIFO; davinci_vc->dev = &pdev->dev; davinci_vc->pdev = pdev;