From c6114a600b284d3ef8b1255e7127815c49d20c9d Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Wed, 24 Jun 2020 15:58:36 +0200 Subject: treewide: make use of PTR_ERR_OR_ZERO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PTR_ERR_OR_ZERO is designed to replace boiler plate like: if (IS_ERR(x)) return PTR_ERR(x); return 0; Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer --- common/globalvar.c | 5 +---- common/serdev.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'common') diff --git a/common/globalvar.c b/common/globalvar.c index c87f2c9339..98a028a68a 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -563,10 +563,7 @@ int globalvar_add_simple_bitmask(const char *name, unsigned long *value, p = dev_add_param_bitmask(&global_device, name, NULL, NULL, value, names, max, NULL); - if (IS_ERR(p)) - return PTR_ERR(p); - - return 0; + return PTR_ERR_OR_ZERO(p); } int globalvar_add_simple_ip(const char *name, IPaddr_t *ip) diff --git a/common/serdev.c b/common/serdev.c index c50b3bd26a..4bf11b1618 100644 --- a/common/serdev.c +++ b/common/serdev.c @@ -84,10 +84,7 @@ int serdev_device_open(struct serdev_device *serdev) p = dev_add_param_uint64(serdev->dev, "polling_interval", serdev_device_set_polling_interval, NULL, &serdev->polling_interval, "%llu", serdev); - if (IS_ERR(p)) - return PTR_ERR(p); - - return 0; + return PTR_ERR_OR_ZERO(p); } unsigned int serdev_device_set_baudrate(struct serdev_device *serdev, -- cgit v1.2.3