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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B443C0015E for ; Fri, 21 Jul 2023 04:38:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230233AbjGUEiO (ORCPT ); Fri, 21 Jul 2023 00:38:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230326AbjGUEhm (ORCPT ); Fri, 21 Jul 2023 00:37:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36F6930DC for ; Thu, 20 Jul 2023 21:37:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8DAEE61040 for ; Fri, 21 Jul 2023 04:37:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94CB8C433C8; Fri, 21 Jul 2023 04:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689914233; bh=lqiaIeTmOuTteURx52L+ADXPaT/uKOKOq5ZUJ+PcfBo=; h=Subject:To:Cc:From:Date:From; b=wFvlra6o2IlsTVxAM1p5MyivvFvHuLXb3YNZcaS6VHJx3EAlg6lN//T/Bwr7QPe8H X6SIpC+0AHM9LHlFnqpY9ZZ/nsNdVF1xdpHBh5EoK2aTeDnA82rcfNDk/Bc9aFxLYt 5cTQrHaVYSa0vZ55rGQ8vOH6i+UAcWv9DjfxoArU= Subject: FAILED: patch "[PATCH] i2c: nomadik: Remove a useless call in the remove function" failed to apply to 6.1-stable tree To: christophe.jaillet@wanadoo.fr, andi.shyti@kernel.org, linus.walleij@linaro.org, stable@vger.kernel.org, wsa@kernel.org Cc: From: Date: Fri, 21 Jul 2023 06:36:55 +0200 Message-ID: <2023072154-strongman-envision-caa9@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 05f933d5f7318b03ff2028c1704dc867ac16f2c7 # git commit -s git send-email --to '' --in-reply-to '2023072154-strongman-envision-caa9@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 05f933d5f731 ("i2c: nomadik: Remove a useless call in the remove function") 9c7174db4cdd ("i2c: nomadik: Use devm_clk_get_enabled()") 1c5d33fff0d3 ("i2c: nomadik: Remove unnecessary goto label") 06e989578232 ("i2c: Improve size determinations") 6b3b21a8542f ("i2c: Delete error messages for failed memory allocations") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 05f933d5f7318b03ff2028c1704dc867ac16f2c7 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET Date: Tue, 4 Jul 2023 21:50:28 +0200 Subject: [PATCH] i2c: nomadik: Remove a useless call in the remove function Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver. So remove the release_mem_region() call from the remove function which is likely a left over. Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: # v3.6+ Acked-by: Linus Walleij Reviewed-by: Andi Shyti Signed-off-by: Christophe JAILLET Signed-off-by: Wolfram Sang diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..212f412f1c74 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) static void nmk_i2c_remove(struct amba_device *adev) { - struct resource *res = &adev->res; struct nmk_i2c_dev *dev = amba_get_drvdata(adev); i2c_del_adapter(&dev->adap); @@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev) clear_all_interrupts(dev); /* disable the controller */ i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); - release_mem_region(res->start, resource_size(res)); } static struct i2c_vendor_data vendor_stn8815 = {