diff --git a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c
index 9dc5967..b12bb0d 100644
--- a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c
+++ b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c
@@ -79,9 +79,7 @@
 	/* use the full partition as our persistent environment storage */
 	cdev = devfs_add_partition("disk0.1", 0, cdev->size,
 						DEVFS_PARTITION_FIXED, "env0");
-	if (IS_ERR(cdev))
-		return PTR_ERR(cdev);
-	return 0;
+	return PTR_ERR_OR_ZERO(cdev);
 }
 
 static int mx23_evk_devices_init(void)
diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c
index 838754d..c9b9479 100644
--- a/arch/arm/boards/karo-tx28/tx28-stk5.c
+++ b/arch/arm/boards/karo-tx28/tx28-stk5.c
@@ -333,9 +333,7 @@
 	/* use the full partition as our persistent environment storage */
 	cdev = devfs_add_partition("disk0.1", 0, cdev->size,
 					DEVFS_PARTITION_FIXED, "env0");
-	if (IS_ERR(cdev))
-		return PTR_ERR(cdev);
-	return 0;
+	return PTR_ERR_OR_ZERO(cdev);
 }
 
 static void tx28_get_ethaddr(void)
diff --git a/common/globalvar.c b/common/globalvar.c
index c87f2c9..98a028a 100644
--- a/common/globalvar.c
+++ b/common/globalvar.c
@@ -563,10 +563,7 @@
 	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 c50b3bd..4bf11b1 100644
--- a/common/serdev.c
+++ b/common/serdev.c
@@ -84,10 +84,7 @@
 	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,
diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c
index c6ad57d..8fc46b6 100644
--- a/drivers/mfd/rave-sp.c
+++ b/drivers/mfd/rave-sp.c
@@ -787,10 +787,7 @@
 
 	p = dev_add_param_ip(dev, "netmask", NULL, rave_sp_req_ip_addr,
 			     &sp->netmask, sp);
-	if (IS_ERR(p))
-		return PTR_ERR(p);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(p);
 }
 
 static int rave_sp_probe(struct device_d *dev)
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index cca6ec4..071bbca 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -324,9 +324,7 @@
 	struct ubi_ltree_entry *le;
 
 	le = ltree_add_entry(ubi, vol_id, lnum);
-	if (IS_ERR(le))
-		return PTR_ERR(le);
-	return 0;
+	return PTR_ERR_OR_ZERO(le);
 }
 
 /**
@@ -362,9 +360,7 @@
 	struct ubi_ltree_entry *le;
 
 	le = ltree_add_entry(ubi, vol_id, lnum);
-	if (IS_ERR(le))
-		return PTR_ERR(le);
-	return 0;
+	return PTR_ERR_OR_ZERO(le);
 }
 
 /**
@@ -383,9 +379,7 @@
 	struct ubi_ltree_entry *le;
 
 	le = ltree_add_entry(ubi, vol_id, lnum);
-	if (IS_ERR(le))
-		return PTR_ERR(le);
-	return 0;
+	return PTR_ERR_OR_ZERO(le);
 }
 
 /**
diff --git a/drivers/net/designware_generic.c b/drivers/net/designware_generic.c
index 809c7b7..90fca19 100644
--- a/drivers/net/designware_generic.c
+++ b/drivers/net/designware_generic.c
@@ -21,10 +21,7 @@
 	struct dw_eth_dev *dwc;
 
 	dwc = dwc_drv_probe(dev);
-	if (IS_ERR(dwc))
-		return PTR_ERR(dwc);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(dwc);
 }
 
 static __maybe_unused struct of_device_id dwc_ether_compatible[] = {
diff --git a/drivers/pci/pci-tegra.c b/drivers/pci/pci-tegra.c
index 7f10b7a..b534285 100644
--- a/drivers/pci/pci-tegra.c
+++ b/drivers/pci/pci-tegra.c
@@ -822,10 +822,7 @@
 		return PTR_ERR(pcie->afi_rst);
 
 	pcie->pcie_xrst = reset_control_get(pcie->dev, "pcie_x");
-	if (IS_ERR(pcie->pcie_xrst))
-		return PTR_ERR(pcie->pcie_xrst);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(pcie->pcie_xrst);
 }
 
 static int tegra_pcie_get_resources(struct tegra_pcie *pcie)
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 878f4d7..aba6c2a 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -122,10 +122,7 @@
 
 	p = dev_add_param_bool(&pwm->dev, "inverted", apply_params,
 			       NULL, &pwm->params.polarity, pwm);
-	if (IS_ERR(p))
-		return PTR_ERR(p);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(p);
 }
 EXPORT_SYMBOL_GPL(pwmchip_add);
 
diff --git a/drivers/usb/otg/otgdev.c b/drivers/usb/otg/otgdev.c
index 7017796..52f43b7 100644
--- a/drivers/usb/otg/otgdev.c
+++ b/drivers/usb/otg/otgdev.c
@@ -62,8 +62,5 @@
 	param_mode = dev_add_param_enum(&otg_device, "mode",
 			otg_set_mode, NULL, &otg_mode,
 			otg_mode_names, ARRAY_SIZE(otg_mode_names), ctx);
-	if (IS_ERR(param_mode))
-		return PTR_ERR(param_mode);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(param_mode);
 }
diff --git a/drivers/watchdog/rave-sp-wdt.c b/drivers/watchdog/rave-sp-wdt.c
index dc673ee..cad63e2 100644
--- a/drivers/watchdog/rave-sp-wdt.c
+++ b/drivers/watchdog/rave-sp-wdt.c
@@ -299,10 +299,7 @@
 			      rave_sp_wdt_set_boot_source,
 			      rave_sp_wdt_get_boot_source,
 			      &sp_wd->boot_source, "%u", sp_wd);
-	if (IS_ERR(p))
-		return PTR_ERR(p);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(p);
 }
 
 static int rave_sp_wdt_probe(struct device_d *dev)