From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE26039FF4 for ; Wed, 12 Jun 2024 18:22:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718216557; cv=none; b=B44ZY6dYyDw4IZ3jDAHlLKrUfgG2ju4hJaV85q6z5SMmrSCrkGB3eKrqVxvi1+sw7Hq6GwaRB3b8Ia8Jvp1VqgGRljYzPbFsIUXSNZDyGI2Jz4pVrWmPHmdvZm2rEp934sNZcFsidgCa1H2dp7ciIVtaFrFitWQE6VaMF+qKKiU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718216557; c=relaxed/simple; bh=q1OMT4Dr55HaO6CoPZ19S7jAdh6kFQ83NiIvoxF/1Q0=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=sX07gRtrOiaCOKlcRblcNFkxhYRtYmPXXHwX96e9DQ0d18irsB6zYLO+xFbbZzBdMDceNLoUVlaRuffuTol5LqYVY0EdLnGwMmba3TidKDKjk/QGfu4XalmfiADsKL1ocZv7XCBtdAqDJHMDr1QeShZC9HEgbaFZaqo4RG8QJjU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qiR7IN4n; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="qiR7IN4n" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14669C116B1; Wed, 12 Jun 2024 18:22:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718216557; bh=q1OMT4Dr55HaO6CoPZ19S7jAdh6kFQ83NiIvoxF/1Q0=; h=Subject:To:Cc:From:Date:From; b=qiR7IN4nGVBgdQ1XBy0YP0P1fhBl2QXGqFkRd5QpapDjn8aj4pb7SCwsJZOQJzaFK 3v+5XoRtx0zzJipWyGeP2mMyqssyLUsm1GATZyelnHUwouICCDNqZF+fiKK9dBZWUa d1AZKExeu6T9iE02aoazVKNT/DJ6sH3wOLP8Xf78= Subject: FAILED: patch "[PATCH] mmc: davinci: Don't strip remove function when driver is" failed to apply to 5.10-stable tree To: u.kleine-koenig@pengutronix.de,ulf.hansson@linaro.org Cc: From: Date: Wed, 12 Jun 2024 20:22:29 +0200 Message-ID: <2024061229-crying-exemplary-9dce@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-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-5.10.y git checkout FETCH_HEAD git cherry-pick -x 55c421b364482b61c4c45313a535e61ed5ae4ea3 # git commit -s git send-email --to '' --in-reply-to '2024061229-crying-exemplary-9dce@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 55c421b36448 ("mmc: davinci: Don't strip remove function when driver is builtin") bc1711e8332d ("mmc: davinci_mmc: Convert to platform remove callback returning void") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 55c421b364482b61c4c45313a535e61ed5ae4ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Sun, 24 Mar 2024 12:40:17 +0100 Subject: [PATCH] mmc: davinci: Don't strip remove function when driver is builtin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using __exit for the remove function results in the remove callback being discarded with CONFIG_MMC_DAVINCI=y. When such a device gets unbound (e.g. using sysfs or hotplug), the driver is just removed without the cleanup being performed. This results in resource leaks. Fix it by compiling in the remove callback unconditionally. This also fixes a W=1 modpost warning: WARNING: modpost: drivers/mmc/host/davinci_mmc: section mismatch in reference: davinci_mmcsd_driver+0x10 (section: .data) -> davinci_mmcsd_remove (section: .exit.text) Fixes: b4cff4549b7a ("DaVinci: MMC: MMC/SD controller driver for DaVinci family") Signed-off-by: Uwe Kleine-König Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240324114017.231936-2-u.kleine-koenig@pengutronix.de Signed-off-by: Ulf Hansson diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index 8bd938919687..d7427894e0bc 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c @@ -1337,7 +1337,7 @@ static int davinci_mmcsd_probe(struct platform_device *pdev) return ret; } -static void __exit davinci_mmcsd_remove(struct platform_device *pdev) +static void davinci_mmcsd_remove(struct platform_device *pdev) { struct mmc_davinci_host *host = platform_get_drvdata(pdev); @@ -1392,7 +1392,7 @@ static struct platform_driver davinci_mmcsd_driver = { .of_match_table = davinci_mmc_dt_ids, }, .probe = davinci_mmcsd_probe, - .remove_new = __exit_p(davinci_mmcsd_remove), + .remove_new = davinci_mmcsd_remove, .id_table = davinci_mmc_devtype, };