rtc: nvmem: don't use IS_ERR_OR_NULL
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Sun, 20 May 2018 15:26:40 +0000 (17:26 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 21 May 2018 20:34:38 +0000 (22:34 +0200)
nvmem_register() never returns NULL, so IS_ERR is good enough here.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/nvmem.c

index 17ec4c8..36ab183 100644 (file)
@@ -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 */