From: Uwe Kleine-König Date: Sun, 20 May 2018 15:26:40 +0000 (+0200) Subject: rtc: nvmem: don't use IS_ERR_OR_NULL X-Git-Tag: v4.18-rc1~64^2~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=046dbb2420cee74b31fd2ce266d3e2629d8c7b8a;p=thirdparty%2Flinux.git rtc: nvmem: don't use IS_ERR_OR_NULL nvmem_register() never returns NULL, so IS_ERR is good enough here. Signed-off-by: Uwe Kleine-König Signed-off-by: Alexandre Belloni --- diff --git a/drivers/rtc/nvmem.c b/drivers/rtc/nvmem.c index 17ec4c8d0fad7..36ab183c42f11 100644 --- a/drivers/rtc/nvmem.c +++ b/drivers/rtc/nvmem.c @@ -94,7 +94,7 @@ int rtc_nvmem_register(struct rtc_device *rtc, nvmem_config->dev = rtc->dev.parent; nvmem_config->owner = rtc->owner; rtc->nvmem = nvmem_register(nvmem_config); - if (IS_ERR_OR_NULL(rtc->nvmem)) + if (IS_ERR(rtc->nvmem)) return PTR_ERR(rtc->nvmem); /* Register the old ABI */