From: Uwe Kleine-König Date: Thu, 9 Sep 2021 14:06:52 +0000 (+0100) Subject: ARM: 9123/1: scoop: Drop if with an always false condition X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1c1838757611e2fd3aa798b4a9219f8777f29149;p=linux.git ARM: 9123/1: scoop: Drop if with an always false condition The remove callback is only called after probe completed successfully. In this case platform_set_drvdata() was called with a non-NULL argument and so !sdev is never true. The motivation for this change is to get rid of non-zero return values for remove callbacks as their only effect is to trigger a runtime warning. See commit e5e1c2097881 ("driver core: platform: Emit a warning if a remove callback returned non-zero") for further details. Link: https://lore.kernel.org/linux-arm-kernel/20210721205450.2173923-1-u.kleine-koenig@pengutronix.de Reviewed-by: Greg Kroah-Hartman Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King (Oracle) --- diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 6edb961bd6c1d..e74c5bfdc6d31 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -240,9 +240,6 @@ static int scoop_remove(struct platform_device *pdev) { struct scoop_dev *sdev = platform_get_drvdata(pdev); - if (!sdev) - return -EINVAL; - if (sdev->gpio.base != -1) gpiochip_remove(&sdev->gpio);