Input: iqs62x-keys - suppress duplicated error message in .remove()

Uwe Kleine-König · dtor · commit 6906f5060d39 · 2023-03-19T21:34:24.000-07:00
If a platform driver's remove callback returns non-zero the driver core emits an error message. In such a case however iqs62x_keys_remove() already issued a (better) message. So return zero to suppress the generic message. This patch has no other side effects as platform_remove() ignores the return value of .remove() after the warning. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230318225110.261439-1-u.kleine-koenig@pengutronix.de Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
diff --git a/drivers/input/keyboard/iqs62x-keys.c b/drivers/input/keyboard/iqs62x-keys.c
@@ -320,7 +320,7 @@ static int iqs62x_keys_remove(struct platform_device *pdev)
 	if (ret)
 		dev_err(&pdev->dev, "Failed to unregister notifier: %d\n", ret);
 
-	return ret;
+	return 0;
 }
 
 static struct platform_driver iqs62x_keys_platform_driver = {

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ static int iqs62x_keys_remove(struct platform_device *pdev)`
`320`	`320`	`if (ret)`
`321`	`321`	`dev_err(&pdev->dev, "Failed to unregister notifier: %d\n", ret);`
`322`	`322`
`323`		`- return ret;`
	`323`	`+ return 0;`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`static struct platform_driver iqs62x_keys_platform_driver = {`