38 files changed, 102 insertions, 103 deletions

diff --git a/drivers/acpi/acpi_dbg.c b/drivers/acpi/acpi_dbg.c
index 15e4604efba7..1f4128487dd4 100644
--- a/drivers/acpi/acpi_dbg.c
+++ b/drivers/acpi/acpi_dbg.c
@@ -265,7 +265,7 @@ static int acpi_aml_write_kern(const char *buf, int len)
         char *p;
 
         ret = acpi_aml_lock_write(crc, ACPI_AML_OUT_KERN);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 return ret;
         /* sync tail before inserting logs */
         smp_mb();
@@ -286,7 +286,7 @@ static int acpi_aml_readb_kern(void)
         char *p;
 
         ret = acpi_aml_lock_read(crc, ACPI_AML_IN_KERN);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 return ret;
         /* sync head before removing cmds */
         smp_rmb();
@@ -330,7 +330,7 @@ again:
                                 goto again;
                         break;
                 }
-                if (IS_ERR_VALUE(ret))
+                if (ret < 0)
                         break;
                 size += ret;
                 count -= ret;
@@ -373,7 +373,7 @@ again:
                         if (ret == 0)
                                 goto again;
                 }
-                if (IS_ERR_VALUE(ret))
+                if (ret < 0)
                         break;
                 *(msg + size) = (char)ret;
                 size++;
@@ -526,7 +526,7 @@ static int acpi_aml_open(struct inode *inode, struct file *file)
         }
         acpi_aml_io.users++;
 err_lock:
-        if (IS_ERR_VALUE(ret)) {
+        if (ret < 0) {
                 if (acpi_aml_active_reader == file)
                         acpi_aml_active_reader = NULL;
         }
@@ -587,7 +587,7 @@ static int acpi_aml_read_user(char __user *buf, int len)
         char *p;
 
         ret = acpi_aml_lock_read(crc, ACPI_AML_OUT_USER);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 return ret;
         /* sync head before removing logs */
         smp_rmb();
@@ -602,7 +602,7 @@ static int acpi_aml_read_user(char __user *buf, int len)
         crc->tail = (crc->tail + n) & (ACPI_AML_BUF_SIZE - 1);
         ret = n;
 out:
-        acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, !IS_ERR_VALUE(ret));
+        acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, !ret);
         return ret;
 }
 
@@ -634,7 +634,7 @@ again:
                                         goto again;
                         }
                 }
-                if (IS_ERR_VALUE(ret)) {
+                if (ret < 0) {
                         if (!acpi_aml_running())
                                 ret = 0;
                         break;
@@ -657,7 +657,7 @@ static int acpi_aml_write_user(const char __user *buf, int len)
         char *p;
 
         ret = acpi_aml_lock_write(crc, ACPI_AML_IN_USER);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 return ret;
         /* sync tail before inserting cmds */
         smp_mb();
@@ -672,7 +672,7 @@ static int acpi_aml_write_user(const char __user *buf, int len)
         crc->head = (crc->head + n) & (ACPI_AML_BUF_SIZE - 1);
         ret = n;
 out:
-        acpi_aml_unlock_fifo(ACPI_AML_IN_USER, !IS_ERR_VALUE(ret));
+        acpi_aml_unlock_fifo(ACPI_AML_IN_USER, !ret);
         return n;
 }
 
@@ -704,7 +704,7 @@ again:
                                         goto again;
                         }
                 }
-                if (IS_ERR_VALUE(ret)) {
+                if (ret < 0) {
                         if (!acpi_aml_running())
                                 ret = 0;
                         break;
diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index 8638d575b2b9..aafb8cc03523 100644
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -197,7 +197,7 @@ static void highbank_set_em_messages(struct device *dev,
 
         for (i = 0; i < SGPIO_PINS; i++) {
                 err = of_get_named_gpio(np, "calxeda,sgpio-gpio", i);
-                if (IS_ERR_VALUE(err))
+                if (err < 0)
                         return;
 
                 pdata->sgpio_gpio[i] = err;
diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c
index b8551813ec43..456cf586d2c2 100644
--- a/drivers/clk/tegra/clk-tegra210.c
+++ b/drivers/clk/tegra/clk-tegra210.c
@@ -1221,7 +1221,7 @@ static int tegra210_pll_fixed_mdiv_cfg(struct clk_hw *hw,
                 p = rate >= params->vco_min ? 1 : -EINVAL;
         }
 
-        if (IS_ERR_VALUE(p))
+        if (p < 0)
                 return -EINVAL;
 
         cfg->m = tegra_pll_get_fixed_mdiv(hw, input_rate);
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index cead9bec4843..376e63ca94e8 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -54,7 +54,7 @@ static int omap_target(struct cpufreq_policy *policy, unsigned int index)
 
         freq = new_freq * 1000;
         ret = clk_round_rate(policy->clk, freq);
-        if (IS_ERR_VALUE(ret)) {
+        if (ret < 0) {
                 dev_warn(mpu_dev,
                          "CPUfreq: Cannot find matching frequency for %lu\n",
                          freq);
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 44d30b45f3cc..5ad5f3009ae0 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -402,7 +402,7 @@ int caam_get_era(void)
         ret = of_property_read_u32(caam_node, "fsl,sec-era", &prop);
         of_node_put(caam_node);
 
-        return IS_ERR_VALUE(ret) ? -ENOTSUPP : prop;
+        return ret ? -ENOTSUPP : prop;
 }
 EXPORT_SYMBOL(caam_get_era);
 
diff --git a/drivers/dma/sun4i-dma.c b/drivers/dma/sun4i-dma.c
index e0df233dde92..57aa227bfadb 100644
--- a/drivers/dma/sun4i-dma.c
+++ b/drivers/dma/sun4i-dma.c
@@ -461,25 +461,25 @@ generate_ndma_promise(struct dma_chan *chan, dma_addr_t src, dma_addr_t dest,
 
         /* Source burst */
         ret = convert_burst(sconfig->src_maxburst);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 goto fail;
         promise->cfg |= SUN4I_DMA_CFG_SRC_BURST_LENGTH(ret);
 
         /* Destination burst */
         ret = convert_burst(sconfig->dst_maxburst);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 goto fail;
         promise->cfg |= SUN4I_DMA_CFG_DST_BURST_LENGTH(ret);
 
         /* Source bus width */
         ret = convert_buswidth(sconfig->src_addr_width);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 goto fail;
         promise->cfg |= SUN4I_DMA_CFG_SRC_DATA_WIDTH(ret);
 
         /* Destination bus width */
         ret = convert_buswidth(sconfig->dst_addr_width);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 goto fail;
         promise->cfg |= SUN4I_DMA_CFG_DST_DATA_WIDTH(ret);
 
@@ -518,25 +518,25 @@ generate_ddma_promise(struct dma_chan *chan, dma_addr_t src, dma_addr_t dest,
 
         /* Source burst */
         ret = convert_burst(sconfig->src_maxburst);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 goto fail;
         promise->cfg |= SUN4I_DMA_CFG_SRC_BURST_LENGTH(ret);
 
         /* Destination burst */
         ret = convert_burst(sconfig->dst_maxburst);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 goto fail;
         promise->cfg |= SUN4I_DMA_CFG_DST_BURST_LENGTH(ret);
 
         /* Source bus width */
         ret = convert_buswidth(sconfig->src_addr_width);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 goto fail;
         promise->cfg |= SUN4I_DMA_CFG_SRC_DATA_WIDTH(ret);
 
         /* Destination bus width */
         ret = convert_buswidth(sconfig->dst_addr_width);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 goto fail;
         promise->cfg |= SUN4I_DMA_CFG_DST_DATA_WIDTH(ret);
 
diff --git a/drivers/gpio/gpio-xlp.c b/drivers/gpio/gpio-xlp.c
index 08897dc11915..1a33a19d95b9 100644
--- a/drivers/gpio/gpio-xlp.c
+++ b/drivers/gpio/gpio-xlp.c
@@ -393,7 +393,7 @@ static int xlp_gpio_probe(struct platform_device *pdev)
                 irq_base = irq_alloc_descs(-1, 0, gc->ngpio, 0);
         else
                 irq_base = irq_alloc_descs(-1, XLP_GPIO_IRQ_BASE, gc->ngpio, 0);
-        if (IS_ERR_VALUE(irq_base)) {
+        if (irq_base < 0) {
                 dev_err(&pdev->dev, "Failed to allocate IRQ numbers\n");
                 return irq_base;
         }
diff --git a/drivers/gpu/drm/sti/sti_vtg.c b/drivers/gpu/drm/sti/sti_vtg.c
index 32c7986b63ab..6bf4ce466d20 100644
--- a/drivers/gpu/drm/sti/sti_vtg.c
+++ b/drivers/gpu/drm/sti/sti_vtg.c
@@ -437,7 +437,7 @@ static int vtg_probe(struct platform_device *pdev)
                         return -EPROBE_DEFER;
         } else {
                 vtg->irq = platform_get_irq(pdev, 0);
-                if (IS_ERR_VALUE(vtg->irq)) {
+                if (vtg->irq < 0) {
                         DRM_ERROR("Failed to get VTG interrupt\n");
                         return vtg->irq;
                 }
@@ -447,7 +447,7 @@ static int vtg_probe(struct platform_device *pdev)
                 ret = devm_request_threaded_irq(dev, vtg->irq, vtg_irq,
                                 vtg_irq_thread, IRQF_ONESHOT,
                                 dev_name(dev), vtg);
-                if (IS_ERR_VALUE(ret)) {
+                if (ret < 0) {
                         DRM_ERROR("Failed to register VTG interrupt\n");
                         return ret;
                 }
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index 7716f42f8aab..6b8c5b3bf588 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -342,7 +342,7 @@ static int tfp410_probe(struct platform_device *pdev)
 
         tfp410_mod->gpio = of_get_named_gpio_flags(node, "powerdn-gpio",
                         0, NULL);
-        if (IS_ERR_VALUE(tfp410_mod->gpio)) {
+        if (tfp410_mod->gpio < 0) {
                 dev_warn(&pdev->dev, "No power down GPIO\n");
         } else {
                 ret = gpio_request(tfp410_mod->gpio, "DVI_PDn");
diff --git a/drivers/gpu/host1x/hw/intr_hw.c b/drivers/gpu/host1x/hw/intr_hw.c
index 498b37e39058..e1e31e9e67cd 100644
--- a/drivers/gpu/host1x/hw/intr_hw.c
+++ b/drivers/gpu/host1x/hw/intr_hw.c
@@ -85,7 +85,7 @@ static int _host1x_intr_init_host_sync(struct host1x *host, u32 cpm,
         err = devm_request_irq(host->dev, host->intr_syncpt_irq,
                                syncpt_thresh_isr, IRQF_SHARED,
                                "host1x_syncpt", host);
-        if (IS_ERR_VALUE(err)) {
+        if (err < 0) {
                 WARN_ON(1);
                 return err;
         }
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index ebab33e77d67..94b68213c50d 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -1477,7 +1477,7 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain,
         struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg;
 
         asid = arm_smmu_bitmap_alloc(smmu->asid_map, smmu->asid_bits);
-        if (IS_ERR_VALUE(asid))
+        if (asid < 0)
                 return asid;
 
         cfg->cdptr = dmam_alloc_coherent(smmu->dev, CTXDESC_CD_DWORDS << 3,
@@ -1508,7 +1508,7 @@ static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain,
         struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg;
 
         vmid = arm_smmu_bitmap_alloc(smmu->vmid_map, smmu->vmid_bits);
-        if (IS_ERR_VALUE(vmid))
+        if (vmid < 0)
                 return vmid;
 
         cfg->vmid       = (u16)vmid;
@@ -1569,7 +1569,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain)
         smmu_domain->pgtbl_ops = pgtbl_ops;
 
         ret = finalise_stage_fn(smmu_domain, &pgtbl_cfg);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 free_io_pgtable_ops(pgtbl_ops);
 
         return ret;
@@ -1642,7 +1642,7 @@ static void arm_smmu_detach_dev(struct device *dev)
         struct arm_smmu_group *smmu_group = arm_smmu_group_get(dev);
 
         smmu_group->ste.bypass = true;
-        if (IS_ERR_VALUE(arm_smmu_install_ste_for_group(smmu_group)))
+        if (arm_smmu_install_ste_for_group(smmu_group) < 0)
                 dev_warn(dev, "failed to install bypass STE\n");
 
         smmu_group->domain = NULL;
@@ -1694,7 +1694,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
         smmu_group->ste.bypass  = domain->type == IOMMU_DOMAIN_DMA;
 
         ret = arm_smmu_install_ste_for_group(smmu_group);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 smmu_group->domain = NULL;
 
 out_unlock:
@@ -2235,7 +2235,7 @@ static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
                                                 arm_smmu_evtq_handler,
                                                 arm_smmu_evtq_thread,
                                                 0, "arm-smmu-v3-evtq", smmu);
-                if (IS_ERR_VALUE(ret))
+                if (ret < 0)
                         dev_warn(smmu->dev, "failed to enable evtq irq\n");
         }
 
@@ -2244,7 +2244,7 @@ static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
                 ret = devm_request_irq(smmu->dev, irq,
                                        arm_smmu_cmdq_sync_handler, 0,
                                        "arm-smmu-v3-cmdq-sync", smmu);
-                if (IS_ERR_VALUE(ret))
+                if (ret < 0)
                         dev_warn(smmu->dev, "failed to enable cmdq-sync irq\n");
         }
 
@@ -2252,7 +2252,7 @@ static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
         if (irq) {
                 ret = devm_request_irq(smmu->dev, irq, arm_smmu_gerror_handler,
                                        0, "arm-smmu-v3-gerror", smmu);
-                if (IS_ERR_VALUE(ret))
+                if (ret < 0)
                         dev_warn(smmu->dev, "failed to enable gerror irq\n");
         }
 
@@ -2264,7 +2264,7 @@ static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
                                                         arm_smmu_priq_thread,
                                                         0, "arm-smmu-v3-priq",
                                                         smmu);
-                        if (IS_ERR_VALUE(ret))
+                        if (ret < 0)
                                 dev_warn(smmu->dev,
                                          "failed to enable priq irq\n");
                         else
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index e206ce7a4e4b..9345a3fcb706 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -950,7 +950,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
 
         ret = __arm_smmu_alloc_bitmap(smmu->context_map, start,
                                       smmu->num_context_banks);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 goto out_unlock;
 
         cfg->cbndx = ret;
@@ -989,7 +989,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
         irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx];
         ret = request_irq(irq, arm_smmu_context_fault, IRQF_SHARED,
                           "arm-smmu-context-fault", domain);
-        if (IS_ERR_VALUE(ret)) {
+        if (ret < 0) {
                 dev_err(smmu->dev, "failed to request context IRQ %d (%u)\n",
                         cfg->irptndx, irq);
                 cfg->irptndx = INVALID_IRPTNDX;
@@ -1099,7 +1099,7 @@ static int arm_smmu_master_configure_smrs(struct arm_smmu_device *smmu,
         for (i = 0; i < cfg->num_streamids; ++i) {
                 int idx = __arm_smmu_alloc_bitmap(smmu->smr_map, 0,
                                                   smmu->num_mapping_groups);
-                if (IS_ERR_VALUE(idx)) {
+                if (idx < 0) {
                         dev_err(smmu->dev, "failed to allocate free SMR\n");
                         goto err_free_smrs;
                 }
@@ -1233,7 +1233,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
 
         /* Ensure that the domain is finalised */
         ret = arm_smmu_init_domain_context(domain, smmu);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 return ret;
 
         /*
diff --git a/drivers/irqchip/irq-clps711x.c b/drivers/irqchip/irq-clps711x.c
index eb5eb0cd414d..2223b3f15d68 100644
--- a/drivers/irqchip/irq-clps711x.c
+++ b/drivers/irqchip/irq-clps711x.c
@@ -182,7 +182,7 @@ static int __init _clps711x_intc_init(struct device_node *np,
         writel_relaxed(0, clps711x_intc->intmr[2]);
 
         err = irq_alloc_descs(-1, 0, ARRAY_SIZE(clps711x_irqs), numa_node_id());
-        if (IS_ERR_VALUE(err))
+        if (err < 0)
                 goto out_iounmap;
 
         clps711x_intc->ops.map = clps711x_intc_irq_map;
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index b4e647179346..fbc4ae2afd29 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1123,7 +1123,7 @@ static int __init __gic_init_bases(struct gic_chip_data *gic, int irq_start,
 
                 irq_base = irq_alloc_descs(irq_start, 16, gic_irqs,
                                            numa_node_id());
-                if (IS_ERR_VALUE(irq_base)) {
+                if (irq_base < 0) {
                         WARN(1, "Cannot allocate irq_descs @ IRQ%d, assuming pre-allocated\n",
                              irq_start);
                         irq_base = irq_start;
diff --git a/drivers/irqchip/irq-hip04.c b/drivers/irqchip/irq-hip04.c
index 9688d2e2a636..9e25d8ce08e5 100644
--- a/drivers/irqchip/irq-hip04.c
+++ b/drivers/irqchip/irq-hip04.c
@@ -402,7 +402,7 @@ hip04_of_init(struct device_node *node, struct device_node *parent)
         nr_irqs -= hwirq_base; /* calculate # of irqs to allocate */
 
         irq_base = irq_alloc_descs(-1, hwirq_base, nr_irqs, numa_node_id());
-        if (IS_ERR_VALUE(irq_base)) {
+        if (irq_base < 0) {
                 pr_err("failed to allocate IRQ numbers\n");
                 return -EINVAL;
         }
diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c
index 1ccd2abed65f..1518ba31a80c 100644
--- a/drivers/irqchip/spear-shirq.c
+++ b/drivers/irqchip/spear-shirq.c
@@ -232,7 +232,7 @@ static int __init shirq_init(struct spear_shirq **shirq_blocks, int block_nr,
                 nr_irqs += shirq_blocks[i]->nr_irqs;
 
         virq_base = irq_alloc_descs(-1, 0, nr_irqs, 0);
-        if (IS_ERR_VALUE(virq_base)) {
+        if (virq_base < 0) {
                 pr_err("%s: irq desc alloc failed\n", __func__);
                 goto err_unmap;
         }
diff --git a/drivers/media/i2c/adp1653.c b/drivers/media/i2c/adp1653.c
index 9e1731c565e7..e191e295c951 100644
--- a/drivers/media/i2c/adp1653.c
+++ b/drivers/media/i2c/adp1653.c
@@ -95,7 +95,7 @@ static int adp1653_get_fault(struct adp1653_flash *flash)
         int rval;
 
         fault = i2c_smbus_read_byte_data(client, ADP1653_REG_FAULT);
-        if (IS_ERR_VALUE(fault))
+        if (fault < 0)
                 return fault;
 
         flash->fault |= fault;
@@ -105,13 +105,13 @@ static int adp1653_get_fault(struct adp1653_flash *flash)
 
         /* Clear faults. */
         rval = i2c_smbus_write_byte_data(client, ADP1653_REG_OUT_SEL, 0);
-        if (IS_ERR_VALUE(rval))
+        if (rval < 0)
                 return rval;
 
         flash->led_mode->val = V4L2_FLASH_LED_MODE_NONE;
 
         rval = adp1653_update_hw(flash);
-        if (IS_ERR_VALUE(rval))
+        if (rval)
                 return rval;
 
         return flash->fault;
@@ -158,7 +158,7 @@ static int adp1653_get_ctrl(struct v4l2_ctrl *ctrl)
         int rval;
 
         rval = adp1653_get_fault(flash);
-        if (IS_ERR_VALUE(rval))
+        if (rval)
                 return rval;
 
         ctrl->cur.val = 0;
@@ -184,7 +184,7 @@ static int adp1653_set_ctrl(struct v4l2_ctrl *ctrl)
         int rval;
 
         rval = adp1653_get_fault(flash);
-        if (IS_ERR_VALUE(rval))
+        if (rval)
                 return rval;
         if ((rval & (ADP1653_REG_FAULT_FLT_SCP |
                      ADP1653_REG_FAULT_FLT_OT |
diff --git a/drivers/media/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c
index 5ef67774971d..8a5d19469ddc 100644
--- a/drivers/media/platform/s5p-tv/mixer_drv.c
+++ b/drivers/media/platform/s5p-tv/mixer_drv.c
@@ -146,7 +146,7 @@ int mxr_power_get(struct mxr_device *mdev)
 
         /* returning 1 means that power is already enabled,
          * so zero success be returned */
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 return ret;
         return 0;
 }
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index 40e51b0baa46..b46c0cfc27d9 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -696,7 +696,7 @@ int twl4030_init_irq(struct device *dev, int irq_num)
         nr_irqs = TWL4030_PWR_NR_IRQS + TWL4030_CORE_NR_IRQS;
 
         irq_base = irq_alloc_descs(-1, 0, nr_irqs, 0);
-        if (IS_ERR_VALUE(irq_base)) {
+        if (irq_base < 0) {
                 dev_err(dev, "Fail to allocate IRQ descs\n");
                 return irq_base;
         }
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index b81b08f81325..c984321d1881 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1276,7 +1276,7 @@ static int mmc_select_hs200(struct mmc_card *card)
          * switch to HS200 mode if bus width is set successfully.
          */
         err = mmc_select_bus_width(card);
-        if (!IS_ERR_VALUE(err)) {
+        if (!err) {
                 val = EXT_CSD_TIMING_HS200 |
                       card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
                 err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
@@ -1583,7 +1583,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
         } else if (mmc_card_hs(card)) {
                 /* Select the desired bus width optionally */
                 err = mmc_select_bus_width(card);
-                if (!IS_ERR_VALUE(err)) {
+                if (!err) {
                         err = mmc_select_hs_ddr(card);
                         if (err)
                                 goto free_card;
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 829a6eebcdce..2cc6123b1df9 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1431,7 +1431,7 @@ static int dw_mci_get_ro(struct mmc_host *mmc)
         int gpio_ro = mmc_gpio_get_ro(mmc);
 
         /* Use platform get_ro function, else try on board write protect */
-        if (!IS_ERR_VALUE(gpio_ro))
+        if (gpio_ro >= 0)
                 read_only = gpio_ro;
         else
                 read_only =
@@ -1454,7 +1454,7 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
         if ((mmc->caps & MMC_CAP_NEEDS_POLL) ||
             (mmc->caps & MMC_CAP_NONREMOVABLE))
                 present = 1;
-        else if (!IS_ERR_VALUE(gpio_cd))
+        else if (gpio_cd >= 0)
                 present = gpio_cd;
         else
                 present = (mci_readl(slot->host, CDETECT) & (1 << slot->id))
@@ -2927,7 +2927,7 @@ static void dw_mci_enable_cd(struct dw_mci *host)
                 if (slot->mmc->caps & MMC_CAP_NEEDS_POLL)
                         return;
 
-                if (IS_ERR_VALUE(mmc_gpio_get_cd(slot->mmc)))
+                if (mmc_gpio_get_cd(slot->mmc) < 0)
                         break;
         }
         if (i == host->num_slots)
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 2d300d87cda8..9d3ae1f4bd3c 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -1011,7 +1011,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
         if (ret)
                 return ret;
 
-        if (!IS_ERR_VALUE(mmc_gpio_get_cd(host->mmc)))
+        if (mmc_gpio_get_cd(host->mmc) >= 0)
                 host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
 
         return 0;
diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
index 25f779e09d8e..d4cef713d246 100644
--- a/drivers/mmc/host/sdhci-of-at91.c
+++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -289,7 +289,7 @@ static int sdhci_at91_probe(struct platform_device *pdev)
          * to enable polling via device tree with broken-cd property.
          */
         if (!(host->mmc->caps & MMC_CAP_NONREMOVABLE) &&
-            IS_ERR_VALUE(mmc_gpio_get_cd(host->mmc))) {
+            mmc_gpio_get_cd(host->mmc) < 0) {
                 host->mmc->caps |= MMC_CAP_NEEDS_POLL;
                 host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
         }
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index e010ea4eb6f5..0e3d7c056cb1 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1624,7 +1624,7 @@ static int sdhci_get_cd(struct mmc_host *mmc)
          * Try slot gpio detect, if defined it take precedence
          * over build in controller functionality
          */
-        if (!IS_ERR_VALUE(gpio_cd))
+        if (gpio_cd >= 0)
                 return !!gpio_cd;
 
         /* If polling, assume that the card is always present. */
@@ -3077,7 +3077,7 @@ int sdhci_add_host(struct sdhci_host *host)
 
         if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) &&
             !(mmc->caps & MMC_CAP_NONREMOVABLE) &&
-            IS_ERR_VALUE(mmc_gpio_get_cd(host->mmc)))
+            mmc_gpio_get_cd(host->mmc) < 0)
                 mmc->caps |= MMC_CAP_NEEDS_POLL;
 
         /* If there are external regulators, get them */
diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
index bcb9dccada4d..1de2e1e51c2b 100644
--- a/drivers/net/ethernet/freescale/fman/fman.c
+++ b/drivers/net/ethernet/freescale/fman/fman.c
@@ -615,7 +615,7 @@ struct fman {
         struct fman_cfg *cfg;
         struct muram_info *muram;
         /* cam section in muram */
-        int cam_offset;
+        unsigned long cam_offset;
         size_t cam_size;
         /* Fifo in MURAM */
         int fifo_offset;
diff --git a/drivers/net/ethernet/freescale/fman/fman_muram.c b/drivers/net/ethernet/freescale/fman/fman_muram.c
index 4eb0e9ac7182..47394c45b6e8 100644
--- a/drivers/net/ethernet/freescale/fman/fman_muram.c
+++ b/drivers/net/ethernet/freescale/fman/fman_muram.c
@@ -129,7 +129,7 @@ unsigned long fman_muram_offset_to_vbase(struct muram_info *muram,
  *
  * Return: address of the allocated memory; NULL otherwise.
  */
-int fman_muram_alloc(struct muram_info *muram, size_t size)
+unsigned long fman_muram_alloc(struct muram_info *muram, size_t size)
 {
         unsigned long vaddr;
 
@@ -150,7 +150,7 @@ int fman_muram_alloc(struct muram_info *muram, size_t size)
  *
  * Free an allocated memory from FM-MURAM partition.
  */
-void fman_muram_free_mem(struct muram_info *muram, u32 offset, size_t size)
+void fman_muram_free_mem(struct muram_info *muram, unsigned long offset, size_t size)
 {
         unsigned long addr = fman_muram_offset_to_vbase(muram, offset);
 
diff --git a/drivers/net/ethernet/freescale/fman/fman_muram.h b/drivers/net/ethernet/freescale/fman/fman_muram.h
index dbf0af9e5bb5..889649ad8931 100644
--- a/drivers/net/ethernet/freescale/fman/fman_muram.h
+++ b/drivers/net/ethernet/freescale/fman/fman_muram.h
@@ -44,8 +44,8 @@ struct muram_info *fman_muram_init(phys_addr_t base, size_t size);
 unsigned long fman_muram_offset_to_vbase(struct muram_info *muram,
                                          unsigned long offset);
 
-int fman_muram_alloc(struct muram_info *muram, size_t size);
+unsigned long fman_muram_alloc(struct muram_info *muram, size_t size);
 
-void fman_muram_free_mem(struct muram_info *muram, u32 offset, size_t size);
+void fman_muram_free_mem(struct muram_info *muram, unsigned long offset, size_t size);
 
 #endif /* __FM_MURAM_EXT */
diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
index 020ac1a4b408..cea9443c22a6 100644
--- a/drivers/net/wireless/ti/wlcore/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
@@ -382,7 +382,7 @@ static int wlcore_probe_of(struct spi_device *spi, struct wl12xx_spi_glue *glue,
 
         ret = of_property_read_u32(dt_node, "ref-clock-frequency",
                                    &pdev_data->ref_clock_freq);
-        if (IS_ERR_VALUE(ret)) {
+        if (ret) {
                 dev_err(glue->dev,
                         "can't get reference clock frequency (%d)\n", ret);
                 return ret;
@@ -425,7 +425,7 @@ static int wl1271_probe(struct spi_device *spi)
         }
 
         ret = wlcore_probe_of(spi, glue, &pdev_data);
-        if (IS_ERR_VALUE(ret)) {
+        if (ret) {
                 dev_err(glue->dev,
                         "can't get device tree parameters (%d)\n", ret);
                 return ret;
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index bb4ea123547f..965911d9b36a 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -113,7 +113,7 @@ static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj,
 
         rc = nvmem_reg_read(nvmem, pos, buf, count);
 
-        if (IS_ERR_VALUE(rc))
+        if (rc)
                 return rc;
 
         return count;
@@ -147,7 +147,7 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,
 
         rc = nvmem_reg_write(nvmem, pos, buf, count);
 
-        if (IS_ERR_VALUE(rc))
+        if (rc)
                 return rc;
 
         return count;
@@ -366,7 +366,7 @@ static int nvmem_add_cells(struct nvmem_device *nvmem,
                 }
 
                 rval = nvmem_cell_info_to_nvmem_cell(nvmem, &info[i], cells[i]);
-                if (IS_ERR_VALUE(rval)) {
+                if (rval) {
                         kfree(cells[i]);
                         goto err;
                 }
@@ -963,7 +963,7 @@ static int __nvmem_cell_read(struct nvmem_device *nvmem,
 
         rc = nvmem_reg_read(nvmem, cell->offset, buf, cell->bytes);
 
-        if (IS_ERR_VALUE(rc))
+        if (rc)
                 return rc;
 
         /* shift bits in-place */
@@ -998,7 +998,7 @@ void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
                 return ERR_PTR(-ENOMEM);
 
         rc = __nvmem_cell_read(nvmem, cell, buf, len);
-        if (IS_ERR_VALUE(rc)) {
+        if (rc) {
                 kfree(buf);
                 return ERR_PTR(rc);
         }
@@ -1083,7 +1083,7 @@ int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len)
         if (cell->bit_offset || cell->nbits)
                 kfree(buf);
 
-        if (IS_ERR_VALUE(rc))
+        if (rc)
                 return rc;
 
         return len;
@@ -1111,11 +1111,11 @@ ssize_t nvmem_device_cell_read(struct nvmem_device *nvmem,
                 return -EINVAL;
 
         rc = nvmem_cell_info_to_nvmem_cell(nvmem, info, &cell);
-        if (IS_ERR_VALUE(rc))
+        if (rc)
                 return rc;
 
         rc = __nvmem_cell_read(nvmem, &cell, buf, &len);
-        if (IS_ERR_VALUE(rc))
+        if (rc)
                 return rc;
 
         return len;
@@ -1141,7 +1141,7 @@ int nvmem_device_cell_write(struct nvmem_device *nvmem,
                 return -EINVAL;
 
         rc = nvmem_cell_info_to_nvmem_cell(nvmem, info, &cell);
-        if (IS_ERR_VALUE(rc))
+        if (rc)
                 return rc;
 
         return nvmem_cell_write(&cell, buf, cell.bytes);
@@ -1170,7 +1170,7 @@ int nvmem_device_read(struct nvmem_device *nvmem,
 
         rc = nvmem_reg_read(nvmem, offset, buf, bytes);
 
-        if (IS_ERR_VALUE(rc))
+        if (rc)
                 return rc;
 
         return bytes;
@@ -1198,7 +1198,7 @@ int nvmem_device_write(struct nvmem_device *nvmem,
 
         rc = nvmem_reg_write(nvmem, offset, buf, bytes);
 
-        if (IS_ERR_VALUE(rc))
+        if (rc)
                 return rc;
 
 
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index a2aa655f56c4..1b7331e40d79 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2360,7 +2360,7 @@ static int pl011_probe_dt_alias(int index, struct device *dev)
                 return ret;
 
         ret = of_alias_get_id(np, "serial");
-        if (IS_ERR_VALUE(ret)) {
+        if (ret < 0) {
                 seen_dev_without_alias = true;
                 ret = index;
         } else {
diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c
index 18971063f95f..699447aa8b43 100644
--- a/drivers/tty/serial/sprd_serial.c
+++ b/drivers/tty/serial/sprd_serial.c
@@ -654,7 +654,7 @@ static int sprd_probe_dt_alias(int index, struct device *dev)
                 return ret;
 
         ret = of_alias_get_id(np, "serial");
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 ret = index;
         else if (ret >= ARRAY_SIZE(sprd_port) || sprd_port[ret] != NULL) {
                 dev_warn(dev, "requested serial port %d not available.\n", ret);
diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
index d8d583d32a37..c229b1a0d13b 100644
--- a/drivers/video/fbdev/da8xx-fb.c
+++ b/drivers/video/fbdev/da8xx-fb.c
@@ -713,7 +713,7 @@ static int da8xx_fb_config_clk_divider(struct da8xx_fb_par *par,
 
         if (par->lcdc_clk_rate != lcdc_clk_rate) {
                 ret = clk_set_rate(par->lcdc_clk, lcdc_clk_rate);
-                if (IS_ERR_VALUE(ret)) {
+                if (ret) {
                         dev_err(par->dev,
                                 "unable to set clock rate at %u\n",
                                 lcdc_clk_rate);
@@ -784,7 +784,7 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
         int ret = 0;
 
         ret = da8xx_fb_calc_config_clk_divider(par, panel);
-        if (IS_ERR_VALUE(ret)) {
+        if (ret) {
                 dev_err(par->dev, "unable to configure clock\n");
                 return ret;
         }
diff --git a/fs/afs/write.c b/fs/afs/write.c
index 65de439bdc4f..14d506efd1aa 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -643,10 +643,6 @@ ssize_t afs_file_write(struct kiocb *iocb, struct iov_iter *from)
                 return 0;
 
         result = generic_file_write_iter(iocb, from);
-        if (IS_ERR_VALUE(result)) {
-                _leave(" = %zd", result);
-                return result;
-        }
 
         _leave(" = %zd", result);
         return result;
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index f723cd3a455c..caf9e39bb82b 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -337,7 +337,7 @@ calc_reloc(unsigned long r, struct lib_info *p, int curid, int internalp)
                                         "(%d != %d)", (unsigned) r, curid, id);
                         goto failed;
                 } else if ( ! p->lib_list[id].loaded &&
-                                IS_ERR_VALUE(load_flat_shared_library(id, p))) {
+                                load_flat_shared_library(id, p) < 0) {
                         printk("BINFMT_FLAT: failed to load library %d", id);
                         goto failed;
                 }
@@ -837,7 +837,7 @@ static int load_flat_shared_library(int id, struct lib_info *libs)
 
         res = prepare_binprm(&bprm);
 
-        if (!IS_ERR_VALUE(res))
+        if (!res)
                 res = load_flat_file(&bprm, libs, id, NULL);
 
         abort_creds(bprm.cred);
@@ -883,7 +883,7 @@ static int load_flat_binary(struct linux_binprm * bprm)
         stack_len += FLAT_STACK_ALIGN - 1;  /* reserve for upcoming alignment */
         
         res = load_flat_file(bprm, &libinfo, 0, &stack_len);
-        if (IS_ERR_VALUE(res))
+        if (res < 0)
                 return res;
         
         /* Update data segment pointers for all libraries */
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 4a01f30e9995..271d93905bac 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -783,12 +783,15 @@ static int get_leaf_nr(struct gfs2_inode *dip, u32 index,
                        u64 *leaf_out)
 {
         __be64 *hash;
+        int error;
 
         hash = gfs2_dir_get_hash_table(dip);
-        if (IS_ERR(hash))
-                return PTR_ERR(hash);
-        *leaf_out = be64_to_cpu(*(hash + index));
-        return 0;
+        error = PTR_ERR_OR_ZERO(hash);
+
+        if (!error)
+                *leaf_out = be64_to_cpu(*(hash + index));
+
+        return error;
 }
 
 static int get_first_leaf(struct gfs2_inode *dip, u32 index,
@@ -798,7 +801,7 @@ static int get_first_leaf(struct gfs2_inode *dip, u32 index,
         int error;
 
         error = get_leaf_nr(dip, index, &leaf_no);
-        if (!IS_ERR_VALUE(error))
+        if (!error)
                 error = get_leaf(dip, leaf_no, bh_out);
 
         return error;
@@ -1014,7 +1017,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name)
 
         index = name->hash >> (32 - dip->i_depth);
         error = get_leaf_nr(dip, index, &leaf_no);
-        if (IS_ERR_VALUE(error))
+        if (error)
                 return error;
 
         /*  Get the old leaf block  */
diff --git a/kernel/pid.c b/kernel/pid.c
index 4d73a834c7e6..f66162f2359b 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -311,7 +311,7 @@ struct pid *alloc_pid(struct pid_namespace *ns)
         pid->level = ns->level;
         for (i = ns->level; i >= 0; i--) {
                 nr = alloc_pidmap(tmp);
-                if (IS_ERR_VALUE(nr)) {
+                if (nr < 0) {
                         retval = nr;
                         goto out_free;
                 }
diff --git a/net/9p/client.c b/net/9p/client.c
index ea79ee9a7348..3fc94a49ccd5 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -518,10 +518,10 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)
                 if (err)
                         goto out_err;
 
-                if (p9_is_proto_dotu(c))
+                if (p9_is_proto_dotu(c) && ecode < 512)
                         err = -ecode;
 
-                if (!err || !IS_ERR_VALUE(err)) {
+                if (!err) {
                         err = p9_errstr2errno(ename, strlen(ename));
 
                         p9_debug(P9_DEBUG_9P, "<<< RERROR (%d) %s\n",
@@ -605,10 +605,10 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
                 if (err)
                         goto out_err;
 
-                if (p9_is_proto_dotu(c))
+                if (p9_is_proto_dotu(c) && ecode < 512)
                         err = -ecode;
 
-                if (!err || !IS_ERR_VALUE(err)) {
+                if (!err) {
                         err = p9_errstr2errno(ename, strlen(ename));
 
                         p9_debug(P9_DEBUG_9P, "<<< RERROR (%d) %s\n",
diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
index 6e8665430bd5..ddfe34434765 100644
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
@@ -491,7 +491,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
                         data->rdma_ch = v->alloc_dma_channel(drvdata,
                                                 SNDRV_PCM_STREAM_PLAYBACK);
 
-                if (IS_ERR_VALUE(data->rdma_ch))
+                if (data->rdma_ch < 0)
                         return data->rdma_ch;
 
                 drvdata->substream[data->rdma_ch] = psubstream;
@@ -518,7 +518,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
                         data->wrdma_ch = v->alloc_dma_channel(drvdata,
                                                 SNDRV_PCM_STREAM_CAPTURE);
 
-                if (IS_ERR_VALUE(data->wrdma_ch))
+                if (data->wrdma_ch < 0)
                         goto capture_alloc_err;
 
                 drvdata->substream[data->wrdma_ch] = csubstream;