From patchwork Fri Feb 5 13:08:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 12070093 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=-21.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,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 6B4C5C433DB for ; Fri, 5 Feb 2021 13:13:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1EB9164FBC for ; Fri, 5 Feb 2021 13:13:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229763AbhBENNN (ORCPT ); Fri, 5 Feb 2021 08:13:13 -0500 Received: from antares.kleine-koenig.org ([94.130.110.236]:34562 "EHLO antares.kleine-koenig.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231284AbhBENJ7 (ORCPT ); Fri, 5 Feb 2021 08:09:59 -0500 Received: by antares.kleine-koenig.org (Postfix, from userid 1000) id D67A7AED6A1; Fri, 5 Feb 2021 14:08:50 +0100 (CET) From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Greg Kroah-Hartman Cc: Alexandre Belloni , Dmitry Torokhov , kvm@vger.kernel.org, David Airlie , Linus Walleij , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Jaroslav Kysela , Eric Anholt , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , linux-i2c@vger.kernel.org, Jiri Slaby , linux-stm32@st-md-mailman.stormreply.com, linux-watchdog@vger.kernel.org, linux-rtc@vger.kernel.org, Herbert Xu , Takashi Iwai , Russell King - ARM Linux admin , Krzysztof Kozlowski , Alexander Shishkin , linux-serial@vger.kernel.org, linux-input@vger.kernel.org, Ulf Hansson , Guenter Roeck , Mike Leach , Maxime Coquelin , Alexandre Torgue , alsa-devel@alsa-project.org, Suzuki K Poulose , coresight@lists.linaro.org, Vladimir Zapolskiy , Eric Auger , Alex Williamson , Mark Brown , Matt Mackall , Dan Williams , Wim Van Sebroeck , kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, Alessandro Zummo , Mathieu Poirier , Cornelia Huck , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Vinod Koul , Arnd Bergmann , linux-crypto@vger.kernel.org, Daniel Vetter , Leo Yan , dmaengine@vger.kernel.org Subject: [PATCH] coresight: etm4x: Fix merge resolution for amba rework Date: Fri, 5 Feb 2021 14:08:47 +0100 Message-Id: <20210205130848.20009-1-uwe@kleine-koenig.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org This was non-trivial to get right because commits c23bc382ef0e ("coresight: etm4x: Refactor probing routine") and 5214b563588e ("coresight: etm4x: Add support for sysreg only devices") changed the code flow considerably. With this change the driver can be built again. Fixes: 0573d3fa4864 ("Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next") Signed-off-by: Uwe Kleine-König --- On Fri, Feb 05, 2021 at 12:07:09PM +0100, Greg Kroah-Hartman wrote: > On Fri, Feb 05, 2021 at 11:56:15AM +0100, Uwe Kleine-König wrote: > > I didn't compile test, but I'm willing to bet your resolution is wrong. > > You have no return statement in etm4_remove_dev() but its return type is > > int and etm4_remove_amba() still returns int but should return void. > > Can you send a patch to fix this up? Sure, here it comes. As I'm unsure if you want to squash it into the merge or want to keep it separate I crafted a commit message. If you prefer squashing feel free to do so. This change corresponds to the merge resolution I suggested before. Best regards Uwe drivers/hwtracing/coresight/coresight-etm4x-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index bc55b261af23..c8ecd91e289e 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -1906,15 +1906,16 @@ static int __exit etm4_remove_dev(struct etmv4_drvdata *drvdata) cpus_read_unlock(); coresight_unregister(drvdata->csdev); + + return 0; } -static int __exit etm4_remove_amba(struct amba_device *adev) +static void __exit etm4_remove_amba(struct amba_device *adev) { struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev); if (drvdata) - return etm4_remove_dev(drvdata); - return 0; + etm4_remove_dev(drvdata); } static int __exit etm4_remove_platform_dev(struct platform_device *pdev)