Skip to content

Commit

Permalink
media: camss: Convert to platform remove callback returning void
Browse files Browse the repository at this point in the history
[ Upstream commit 428bbf4 ]

The .remove() callback for a platform driver returns an int which makes
many driver authors wrongly assume it's possible to do error handling by
returning an error code. However the value returned is (mostly) ignored
and this typically results in resource leaks. To improve here there is a
quest to make the remove callback return void. In the first step of this
quest all drivers are converted to .remove_new() which already returns
void.

Trivially convert this driver from always returning zero in the remove
callback to the void returning variant.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Stable-dep-of: f69791c ("media: qcom: camss: Fix genpd cleanup")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Uwe Kleine-König authored and gregkh committed Dec 3, 2023
1 parent 4ae3c85 commit 153a439
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/media/platform/qcom/camss/camss.c
Original file line number Diff line number Diff line change
Expand Up @@ -1723,7 +1723,7 @@ void camss_delete(struct camss *camss)
*
* Always returns 0.
*/
static int camss_remove(struct platform_device *pdev)
static void camss_remove(struct platform_device *pdev)
{
struct camss *camss = platform_get_drvdata(pdev);

Expand All @@ -1733,8 +1733,6 @@ static int camss_remove(struct platform_device *pdev)

if (atomic_read(&camss->ref_count) == 0)
camss_delete(camss);

return 0;
}

static const struct of_device_id camss_dt_match[] = {
Expand Down Expand Up @@ -1796,7 +1794,7 @@ static const struct dev_pm_ops camss_pm_ops = {

static struct platform_driver qcom_camss_driver = {
.probe = camss_probe,
.remove = camss_remove,
.remove_new = camss_remove,
.driver = {
.name = "qcom-camss",
.of_match_table = camss_dt_match,
Expand Down

0 comments on commit 153a439

Please sign in to comment.