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 D16001DFFB; Thu, 15 Aug 2024 14:30:10 +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=1723732210; cv=none; b=kCplo2+XppSsHvL1cK32ByniuCTVPbY96qKs1ctdHhPV0lgeFcl1grxY6C0zBVxDD2p0+HahFzHEYvVadWkyXgZnDDtN4sI0iyHgGZ9SajfXmo6bjJF20XxrPk/g0xVySs3nqm1RaxXR/zcZsVOSjhNXhuXIDvjrG+OwaqhUpOo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723732210; c=relaxed/simple; bh=B+MwpQWyxrsPfEwNCZAkDYj46GAlZINR40Z1Cu/aQ6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BbDmpeTuVxG+oa/mpCyU4gEkw53k2j1wRKE9bcXHGOwp3LEhumRjx0F4C2bu7A7Tu9hJ8Qs2pdQQ1DvebkExTjQEO6xnLHY2989J/WKcTZs1CIzu1ULE2FuzX8ROJOIhCBXn1pLzjnzdMNJK1ByRWcpgbDi9lQ/n0mJu9xN7B8c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bmYJPYee; 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="bmYJPYee" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 575ECC32786; Thu, 15 Aug 2024 14:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723732210; bh=B+MwpQWyxrsPfEwNCZAkDYj46GAlZINR40Z1Cu/aQ6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bmYJPYeeAHnh82NH6qKtdmjfS9m5Hu58KIl0N3CiEQ4y5SCa/joebKONgmsAhd7KC t7aheFYLrA3dloCI3V4Ig3u8/pjxlwiWazekUhOwGl9wpLgko7MvqO0kthomKeHwOx rnK3+UTfhI1n+AZCP4pl6Q5WLru2GoWqrjVEe7ik= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nick Bowler , Michael Ellerman , Sasha Levin Subject: [PATCH 5.10 108/352] macintosh/therm_windtunnel: fix module unload. Date: Thu, 15 Aug 2024 15:22:54 +0200 Message-ID: <20240815131923.431094678@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131919.196120297@linuxfoundation.org> References: <20240815131919.196120297@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nick Bowler [ Upstream commit fd748e177194ebcbbaf98df75152a30e08230cc6 ] The of_device_unregister call in therm_windtunnel's module_exit procedure does not fully reverse the effects of of_platform_device_create in the module_init prodedure. Once you unload this module, it is impossible to load it ever again since only the first of_platform_device_create call on the fan node succeeds. This driver predates first git commit, and it turns out back then of_platform_device_create worked differently than it does today. So this is actually an old regression. The appropriate function to undo of_platform_device_create now appears to be of_platform_device_destroy, and switching to use this makes it possible to unload and load the module as expected. Signed-off-by: Nick Bowler Fixes: c6e126de43e7 ("of: Keep track of populated platform devices") Signed-off-by: Michael Ellerman Link: https://msgid.link/20240711035428.16696-1-nbowler@draconx.ca Signed-off-by: Sasha Levin --- drivers/macintosh/therm_windtunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index f55f6adf5e5ff..49805eb4d145a 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c @@ -549,7 +549,7 @@ g4fan_exit( void ) platform_driver_unregister( &therm_of_driver ); if( x.of_dev ) - of_device_unregister( x.of_dev ); + of_platform_device_destroy(&x.of_dev->dev, NULL); } module_init(g4fan_init); -- 2.43.0