Message ID | 20221118215401.505480-1-u.kleine-koenig@pengutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp431120wrr; Fri, 18 Nov 2022 14:05:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf6mv5Cdn3ePdquFNRlo8ss8CK3MO/EXG3hgWwk4Nl/1VPhUmUZ1+Q6645fDshU8J26GYGTt X-Received: by 2002:a63:110d:0:b0:46f:6225:c2f9 with SMTP id g13-20020a63110d000000b0046f6225c2f9mr8233359pgl.225.1668809101187; Fri, 18 Nov 2022 14:05:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668809101; cv=none; d=google.com; s=arc-20160816; b=YjDzOfbbWWauKxR95McFtLmFEvTALxLRqT0sYQd9ifOrMONIcDZdqnz/D6FMWAmO/q boxJruJds2uxhpuNSaLZKzPGw8GPLFXOBCDKnZL19D8A42SM+bhIgRoekM3UfFtYtvnC o7YlltmWgyquaWm1wwpCylAVYAarf+qrNS6SEX9MyBOqTYlVsMVT3RWAXQfCkaq39iw+ xU4WBB/hFJFcbfdu44CAE1xfCUlwnO9h2n8nQmL7EvBONpEpq9N9dpU8mLB4cWPxJSSk KxX4E6/WwFZoQ56ZqtdVnCEI+cyS3u/aI/eBBOZgpstpVW0ZnMy0XfCQVXLG/OrE2F9w zsEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=nnfRA4vnGOfCvheCFos+yrOYK2HhMiHA6ViB/Av+ub0=; b=lF9497+dmbQ+wdw3Z2TqCmg+d/S5FZnsurNAllvx4ODamYwCH3yAw6d/JxwshQ6Pac I+66+4EOjbBqfOZlpYFt+IukCe5IOnKMLqcL25269azFpFsDkfdT2SUAdviIkRmgJKM2 TGhBKygCgoO0oTZeJF1hS7JfEWCexYfNpV07wtt5Sih5oUDAVx/ArrWW9H4ZDdcjmDY0 oz89FRGrCFWx5smp55kcd0y0+8o9JjmLmhJQRLbtmBbToL0o5OwVTQZdtaCv5Vj/scWb wTB2O9GBhG9bah4XD6/hWFVwLmQfBZCEfuGmvhaPOJe3FgnjlrHUEZEjGxqrnEo5QhQJ Vvfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z19-20020aa78893000000b0056238741ba7si4997427pfe.174.2022.11.18.14.04.44; Fri, 18 Nov 2022 14:05:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230461AbiKRVyf (ORCPT <rfc822;kkmonlee@gmail.com> + 99 others); Fri, 18 Nov 2022 16:54:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229606AbiKRVye (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 18 Nov 2022 16:54:34 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18335729BF for <linux-kernel@vger.kernel.org>; Fri, 18 Nov 2022 13:54:33 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <ukl@pengutronix.de>) id 1ow9JN-0001VE-Mm; Fri, 18 Nov 2022 22:54:13 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from <ukl@pengutronix.de>) id 1ow9JI-0057eY-6O; Fri, 18 Nov 2022 22:54:09 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from <ukl@pengutronix.de>) id 1ow9JI-00HaPG-6M; Fri, 18 Nov 2022 22:54:08 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> To: Arnd Bergmann <arnd@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>, Vinod Koul <vkoul@kernel.org> Cc: linux-kernel@vger.kernel.org, Ben Dooks <ben-linux@fluff.org>, Simtec Linux Team <linux@simtec.co.uk>, Alim Akhtar <alim.akhtar@samsung.com>, dmaengine@vger.kernel.org, linux-samsung-soc@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH] ARM: s3c: Fix a build error after the s3c24xx dma driver was removed Date: Fri, 18 Nov 2022 22:54:01 +0100 Message-Id: <20221118215401.505480-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221021203329.4143397-14-arnd@kernel.org> References: <20221021203329.4143397-14-arnd@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=789; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=MQY1mKOHphIR2YvCjrphAII3VS7+7iYHC7fhsww+j8w=; b=owGbwMvMwMV48I9IxdpTbzgZT6slMSSX//ua9fr08cpF3wMzXx2QYMvNjLz6dYfKM7P3JcWrNxZy BM1c1clozMLAyMUgK6bIUlekJTZBYs1/u5Il3DCDWJlApjBwcQrARE5UsP+PV9M77fDWfJM8w+2Kw8 UnfiWJ7znC2f3T54qeT6laQu8n5yq9n1tdlneoO14WtnjDwrr4YamuzIS5rCsk/6XFPxXzSVHNPDy5 ved3nIHfkc6bmvYKgbaV3GfYHMwSS8qidL/rTza8GTuf9X3azfOCASYz1n9bmHa58XsKp2Rty1cGn6 D2nZEzws13pTv0KjRPXemQGxPVqDvZZldAbqnN3LN2YWZTN+/2/ZH+53Lcw9gbjmJel6ZLKekwL9jH 1P+C4/L7+v3Ft40P9Xmum72Py23dyyrNmp+1STqOcfWVBsq7L0fu7mDpY1U3rEjiy/xaW6LTqbmqSt Ti4hMZvQrtlzlsFq3Xt9XOtRIBAA== X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749873172024729930?= X-GMAIL-MSGID: =?utf-8?q?1749873172024729930?= |
Series |
ARM: s3c: Fix a build error after the s3c24xx dma driver was removed
|
|
Commit Message
Uwe Kleine-König
Nov. 18, 2022, 9:54 p.m. UTC
The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't
declare or define any symbol needed in devs.c though, so the #include
can just be dropped.
Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
arch/arm/mach-s3c/devs.c | 1 -
1 file changed, 1 deletion(-)
Comments
On 18/11/2022 22:54, Uwe Kleine-König wrote: > The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't > declare or define any symbol needed in devs.c though, so the #include > can just be dropped. > > Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver") > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- The file was not removed... or it should not have been yet. The s3c24xx dma driver removal should be part of Arnd series taken via SoC ARM. Best regards, Krzysztof
On 20/11/2022 11:31, Krzysztof Kozlowski wrote: > On 18/11/2022 22:54, Uwe Kleine-König wrote: >> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't >> declare or define any symbol needed in devs.c though, so the #include >> can just be dropped. >> >> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver") >> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> >> --- > > The file was not removed... or it should not have been yet. The s3c24xx > dma driver removal should be part of Arnd series taken via SoC ARM. Also: I don't think the fix is correct. The header was used in mach-s3c, so removing the header should still cause broken build. It also fails in other places: arch/arm/mach-s3c/s3c24xx.c:21:10: fatal error: linux/platform_data/dma-s3c24xx.h: No such file or directory 21 | #include <linux/platform_data/dma-s3c24xx.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. I think that commit should be just dropped instead. Best regards, Krzysztof
Hello, On Sun, Nov 20, 2022 at 12:22:31PM +0100, Krzysztof Kozlowski wrote: > On 20/11/2022 11:31, Krzysztof Kozlowski wrote: > > On 18/11/2022 22:54, Uwe Kleine-König wrote: > >> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't > >> declare or define any symbol needed in devs.c though, so the #include > >> can just be dropped. > >> > >> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver") > >> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > >> --- > > > > The file was not removed... or it should not have been yet. The s3c24xx > > dma driver removal should be part of Arnd series taken via SoC ARM. The patch enters next with the merge of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next Ah, the patch that became cccc46ae3623 (i.e. patch #14) is part of a bigger series. Its patch #1 removes s3c24xx.c (which you pointed out to be still broken) and patch #2 includes the change I suggested here. > I think that commit should be just dropped instead. +1 BTW, cccc46ae3623 is included in next since next-20221107 and breaks (at least) arm/s3c2410_defconfig. So I would consider reverting cccc46ae3623 a fix. (Added linux-next to Cc:) Best regards Uwe
On 25/11/2022 09:51, Uwe Kleine-König wrote: > Hello, > > On Sun, Nov 20, 2022 at 12:22:31PM +0100, Krzysztof Kozlowski wrote: >> On 20/11/2022 11:31, Krzysztof Kozlowski wrote: >>> On 18/11/2022 22:54, Uwe Kleine-König wrote: >>>> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't >>>> declare or define any symbol needed in devs.c though, so the #include >>>> can just be dropped. >>>> >>>> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver") >>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> >>>> --- >>> >>> The file was not removed... or it should not have been yet. The s3c24xx >>> dma driver removal should be part of Arnd series taken via SoC ARM. > > The patch enters next with the merge of > > git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next > > Ah, the patch that became cccc46ae3623 (i.e. patch #14) is part of a > bigger series. Its patch #1 removes s3c24xx.c (which you pointed out to be still > broken) and patch #2 includes the change I suggested here. > >> I think that commit should be just dropped instead. > > +1 > > BTW, cccc46ae3623 is included in next since next-20221107 and breaks > (at least) arm/s3c2410_defconfig. So I would consider reverting > cccc46ae3623 a fix. (Added linux-next to Cc:) Yes. The build failure of next was reported already by kernel test robot. Vinod, can we drop this patch? Best regards, Krzysztof
Hello, I made the subject a bit more expressive. On Fri, Nov 25, 2022 at 09:52:51AM +0100, Krzysztof Kozlowski wrote: > On 25/11/2022 09:51, Uwe Kleine-König wrote: > > On Sun, Nov 20, 2022 at 12:22:31PM +0100, Krzysztof Kozlowski wrote: > >> On 20/11/2022 11:31, Krzysztof Kozlowski wrote: > >>> On 18/11/2022 22:54, Uwe Kleine-König wrote: > >>>> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't > >>>> declare or define any symbol needed in devs.c though, so the #include > >>>> can just be dropped. > >>>> > >>>> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver") > >>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > >>>> --- > >>> > >>> The file was not removed... or it should not have been yet. The s3c24xx > >>> dma driver removal should be part of Arnd series taken via SoC ARM. > > > > The patch enters next with the merge of > > > > git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next > > > > Ah, the patch that became cccc46ae3623 (i.e. patch #14) is part of a > > bigger series. Its patch #1 removes s3c24xx.c (which you pointed out to be still > > broken) and patch #2 includes the change I suggested here. > > > >> I think that commit should be just dropped instead. > > > > +1 > > > > BTW, cccc46ae3623 is included in next since next-20221107 and breaks > > (at least) arm/s3c2410_defconfig. So I would consider reverting > > cccc46ae3623 a fix. (Added linux-next to Cc:) > > Yes. The build failure of next was reported already by kernel test robot. > > Vinod, can we drop this patch? That patch is still contained in the next tags of this week. :-( Best regards Uwe
On 02-12-22, 12:20, Uwe Kleine-König wrote: > Hello, > > I made the subject a bit more expressive. > > On Fri, Nov 25, 2022 at 09:52:51AM +0100, Krzysztof Kozlowski wrote: > > On 25/11/2022 09:51, Uwe Kleine-König wrote: > > > On Sun, Nov 20, 2022 at 12:22:31PM +0100, Krzysztof Kozlowski wrote: > > >> On 20/11/2022 11:31, Krzysztof Kozlowski wrote: > > >>> On 18/11/2022 22:54, Uwe Kleine-König wrote: > > >>>> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't > > >>>> declare or define any symbol needed in devs.c though, so the #include > > >>>> can just be dropped. > > >>>> > > >>>> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver") > > >>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > >>>> --- > > >>> > > >>> The file was not removed... or it should not have been yet. The s3c24xx > > >>> dma driver removal should be part of Arnd series taken via SoC ARM. > > > > > > The patch enters next with the merge of > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next > > > > > > Ah, the patch that became cccc46ae3623 (i.e. patch #14) is part of a > > > bigger series. Its patch #1 removes s3c24xx.c (which you pointed out to be still > > > broken) and patch #2 includes the change I suggested here. > > > > > >> I think that commit should be just dropped instead. > > > > > > +1 > > > > > > BTW, cccc46ae3623 is included in next since next-20221107 and breaks > > > (at least) arm/s3c2410_defconfig. So I would consider reverting > > > cccc46ae3623 a fix. (Added linux-next to Cc:) > > > > Yes. The build failure of next was reported already by kernel test robot. > > > > Vinod, can we drop this patch? > > That patch is still contained in the next tags of this week. :-( Apologies for delay, I was moving... I have reverted and pushed now Thanks for following up!
Hello Vinod, On Fri, Dec 02, 2022 at 05:12:53PM +0530, Vinod Koul wrote: > On 02-12-22, 12:20, Uwe Kleine-König wrote: > > I made the subject a bit more expressive. I wonder what I intended to write there, something like "Regression in dmaengine/next in arm/s3c2410_defconfig", sorry to make it look as if you already fixed the regression :-) > > On Fri, Nov 25, 2022 at 09:52:51AM +0100, Krzysztof Kozlowski wrote: > > > On 25/11/2022 09:51, Uwe Kleine-König wrote: > > > > On Sun, Nov 20, 2022 at 12:22:31PM +0100, Krzysztof Kozlowski wrote: > > > >> On 20/11/2022 11:31, Krzysztof Kozlowski wrote: > > > >>> On 18/11/2022 22:54, Uwe Kleine-König wrote: > > > >>>> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't > > > >>>> declare or define any symbol needed in devs.c though, so the #include > > > >>>> can just be dropped. > > > >>>> > > > >>>> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver") > > > >>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > > >>>> --- > > > >>> > > > >>> The file was not removed... or it should not have been yet. The s3c24xx > > > >>> dma driver removal should be part of Arnd series taken via SoC ARM. > > > > > > > > The patch enters next with the merge of > > > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next > > > > > > > > Ah, the patch that became cccc46ae3623 (i.e. patch #14) is part of a > > > > bigger series. Its patch #1 removes s3c24xx.c (which you pointed out to be still > > > > broken) and patch #2 includes the change I suggested here. > > > > > > > >> I think that commit should be just dropped instead. > > > > > > > > +1 > > > > > > > > BTW, cccc46ae3623 is included in next since next-20221107 and breaks > > > > (at least) arm/s3c2410_defconfig. So I would consider reverting > > > > cccc46ae3623 a fix. (Added linux-next to Cc:) > > > > > > Yes. The build failure of next was reported already by kernel test robot. > > > > > > Vinod, can we drop this patch? > > > > That patch is still contained in the next tags of this week. :-( > > Apologies for delay, I was moving... > > I have reverted and pushed now Thanks! Best regards Uwe
diff --git a/arch/arm/mach-s3c/devs.c b/arch/arm/mach-s3c/devs.c index 9ac07c023adf..a31d1c3038e8 100644 --- a/arch/arm/mach-s3c/devs.c +++ b/arch/arm/mach-s3c/devs.c @@ -29,7 +29,6 @@ #include <linux/sizes.h> #include <linux/platform_data/s3c-hsudc.h> #include <linux/platform_data/s3c-hsotg.h> -#include <linux/platform_data/dma-s3c24xx.h> #include <linux/platform_data/media/s5p_hdmi.h>