[PATCH 5.10.y] media: i2c: et8ek8: Don't strip remove function when driver is builtin

[PATCH 5.10.y] media: i2c: et8ek8: Don't strip remove function when driver is builtin

[bin.lan.cn]

From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

[ Upstream commit 545b215736c5c4b354e182d99c578a472ac9bfce ]

Using __exit for the remove function results in the remove callback
being discarded with CONFIG_VIDEO_ET8EK8=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/media/i2c/et8ek8/et8ek8: section mismatch in reference: et8ek8_i2c_driver+0x10 (section: .data) -> et8ek8_remove (section: .exit.text)

Fixes: c5254e72b8ed ("[media] media: Driver for Toshiba et8ek8 5MP sensor")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
Signed-off-by: He Zhe <zhe.he@windriver.com>
---
Build test passed.
---
 drivers/media/i2c/et8ek8/et8ek8_driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/et8ek8/et8ek8_driver.c b/drivers/media/i2c/et8ek8/et8ek8_driver.c
index 256acf73d5ea..4d7c4eac5e20 100644
--- a/drivers/media/i2c/et8ek8/et8ek8_driver.c
+++ b/drivers/media/i2c/et8ek8/et8ek8_driver.c
@@ -1460,7 +1460,7 @@ static int et8ek8_probe(struct i2c_client *client)
 	return ret;
 }
 
-static int __exit et8ek8_remove(struct i2c_client *client)
+static int et8ek8_remove(struct i2c_client *client)
 {
 	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
 	struct et8ek8_sensor *sensor = to_et8ek8_sensor(subdev);
@@ -1504,7 +1504,7 @@ static struct i2c_driver et8ek8_i2c_driver = {
 		.of_match_table	= et8ek8_of_table,
 	},
 	.probe_new	= et8ek8_probe,
-	.remove		= __exit_p(et8ek8_remove),
+	.remove		= et8ek8_remove,
 	.id_table	= et8ek8_id_table,
 };
 
-- 
2.34.1

Re: [PATCH 5.10.y] media: i2c: et8ek8: Don't strip remove function when driver is builtin

[Sasha Levin]

[ Sasha's backport helper bot ]

Hi,

✅ All tests passed successfully. No issues detected.
No action required from the submitter.

The upstream commit SHA1 provided is correct: 545b215736c5c4b354e182d99c578a472ac9bfce

WARNING: Author mismatch between patch and upstream commit:
Backport author: bin.lan.cn@windriver.com
Commit author: Uwe Kleine-König<u.kleine-koenig@pengutronix.de>

Status in newer kernel trees:
6.13.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: c1a3803e5bb9)
6.1.y | Not found
5.15.y | Not found

Note: The patch differs from the upstream commit:
---
1:  545b215736c5c ! 1:  7f327a373d739 media: i2c: et8ek8: Don't strip remove function when driver is builtin
    @@ Metadata
      ## Commit message ##
         media: i2c: et8ek8: Don't strip remove function when driver is builtin
     
    +    [ Upstream commit 545b215736c5c4b354e182d99c578a472ac9bfce ]
    +
         Using __exit for the remove function results in the remove callback
         being discarded with CONFIG_VIDEO_ET8EK8=y. When such a device gets
         unbound (e.g. using sysfs or hotplug), the driver is just removed
    @@ Commit message
         Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
         Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
         Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    +    Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
    +    Signed-off-by: He Zhe <zhe.he@windriver.com>
     
      ## drivers/media/i2c/et8ek8/et8ek8_driver.c ##
     @@ drivers/media/i2c/et8ek8/et8ek8_driver.c: static int et8ek8_probe(struct i2c_client *client)
      	return ret;
      }
      
    --static void __exit et8ek8_remove(struct i2c_client *client)
    -+static void et8ek8_remove(struct i2c_client *client)
    +-static int __exit et8ek8_remove(struct i2c_client *client)
    ++static int et8ek8_remove(struct i2c_client *client)
      {
      	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
      	struct et8ek8_sensor *sensor = to_et8ek8_sensor(subdev);
     @@ drivers/media/i2c/et8ek8/et8ek8_driver.c: static struct i2c_driver et8ek8_i2c_driver = {
      		.of_match_table	= et8ek8_of_table,
      	},
    - 	.probe		= et8ek8_probe,
    + 	.probe_new	= et8ek8_probe,
     -	.remove		= __exit_p(et8ek8_remove),
     +	.remove		= et8ek8_remove,
      	.id_table	= et8ek8_id_table,
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y       |  Success    |  Success   |