API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 27th, 2016
277
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 36.01 KB | None | 0 0
raw download clone embed print report
  1. Remove all IS_ERR_VALUE with non-'unsigned long' arguments
  2.  
  3. igned-off-by: Arnd Bergmann <arnd@arndb.de>
  4.  
  5. drivers/acpi/acpi_dbg.c | 22 +++++++++++-----------
  6. drivers/ata/sata_highbank.c | 2 +-
  7. drivers/clk/tegra/clk-tegra210.c | 2 +-
  8. drivers/cpufreq/omap-cpufreq.c | 2 +-
  9. drivers/crypto/caam/ctrl.c | 2 +-
  10. drivers/dma/sun4i-dma.c | 16 ++++++++--------
  11. drivers/gpio/gpio-xlp.c | 2 +-
  12. drivers/gpu/drm/sti/sti_vtg.c | 4 ++--
  13. drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 2 +-
  14. drivers/gpu/host1x/hw/intr_hw.c | 2 +-
  15. drivers/iommu/arm-smmu-v3.c | 18 +++++++++---------
  16. drivers/iommu/arm-smmu.c | 8 ++++----
  17. drivers/irqchip/irq-clps711x.c | 2 +-
  18. drivers/irqchip/irq-gic.c | 2 +-
  19. drivers/irqchip/irq-hip04.c | 2 +-
  20. drivers/irqchip/spear-shirq.c | 2 +-
  21. drivers/media/i2c/adp1653.c | 10 +++++-----
  22. drivers/media/platform/s5p-tv/mixer_drv.c | 2 +-
  23. drivers/mfd/twl4030-irq.c | 2 +-
  24. drivers/mmc/core/mmc.c | 4 ++--
  25. drivers/mmc/host/dw_mmc.c | 6 +++---
  26. drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
  27. drivers/mmc/host/sdhci-of-at91.c | 2 +-
  28. drivers/mmc/host/sdhci.c | 4 ++--
  29. drivers/net/ethernet/freescale/fman/fman.c | 2 +-
  30. drivers/net/ethernet/freescale/fman/fman_muram.c | 4 ++--
  31. drivers/net/ethernet/freescale/fman/fman_muram.h | 4 ++--
  32. drivers/net/wireless/ti/wlcore/spi.c | 4 ++--
  33. drivers/nvmem/core.c | 22 +++++++++++-----------
  34. drivers/tty/serial/amba-pl011.c | 2 +-
  35. drivers/tty/serial/sprd_serial.c | 2 +-
  36. drivers/video/fbdev/da8xx-fb.c | 4 ++--
  37. fs/afs/write.c | 4 ----
  38. fs/binfmt_flat.c | 6 +++---
  39. fs/gfs2/dir.c | 15 +++++++++------
  40. include/linux/err.h | 3 ++-
  41. kernel/pid.c | 2 +-
  42. net/9p/client.c | 4 ++--
  43. sound/soc/qcom/lpass-platform.c | 4 ++--
  44. 39 files changed, 102 insertions(+), 102 deletions(-)
  45.  
  46. diff --git a/drivers/acpi/acpi_dbg.c b/drivers/acpi/acpi_dbg.c
  47. index 15e4604efba7..1f4128487dd4 100644
  48. --- a/drivers/acpi/acpi_dbg.c
  49. +++ b/drivers/acpi/acpi_dbg.c
  50. @@ -265,7 +265,7 @@ static int acpi_aml_write_kern(const char *buf, int len)
  51. char *p;
  52.  
  53. ret = acpi_aml_lock_write(crc, ACPI_AML_OUT_KERN);
  54. - if (IS_ERR_VALUE(ret))
  55. + if (ret < 0)
  56. return ret;
  57. /* sync tail before inserting logs */
  58. smp_mb();
  59. @@ -286,7 +286,7 @@ static int acpi_aml_readb_kern(void)
  60. char *p;
  61.  
  62. ret = acpi_aml_lock_read(crc, ACPI_AML_IN_KERN);
  63. - if (IS_ERR_VALUE(ret))
  64. + if (ret < 0)
  65. return ret;
  66. /* sync head before removing cmds */
  67. smp_rmb();
  68. @@ -330,7 +330,7 @@ again:
  69. goto again;
  70. break;
  71. }
  72. - if (IS_ERR_VALUE(ret))
  73. + if (ret < 0)
  74. break;
  75. size += ret;
  76. count -= ret;
  77. @@ -373,7 +373,7 @@ again:
  78. if (ret == 0)
  79. goto again;
  80. }
  81. - if (IS_ERR_VALUE(ret))
  82. + if (ret < 0)
  83. break;
  84. *(msg + size) = (char)ret;
  85. size++;
  86. @@ -526,7 +526,7 @@ static int acpi_aml_open(struct inode *inode, struct file *file)
  87. }
  88. acpi_aml_io.users++;
  89. err_lock:
  90. - if (IS_ERR_VALUE(ret)) {
  91. + if (ret < 0) {
  92. if (acpi_aml_active_reader == file)
  93. acpi_aml_active_reader = NULL;
  94. }
  95. @@ -587,7 +587,7 @@ static int acpi_aml_read_user(char __user *buf, int len)
  96. char *p;
  97.  
  98. ret = acpi_aml_lock_read(crc, ACPI_AML_OUT_USER);
  99. - if (IS_ERR_VALUE(ret))
  100. + if (ret < 0)
  101. return ret;
  102. /* sync head before removing logs */
  103. smp_rmb();
  104. @@ -602,7 +602,7 @@ static int acpi_aml_read_user(char __user *buf, int len)
  105. crc->tail = (crc->tail + n) & (ACPI_AML_BUF_SIZE - 1);
  106. ret = n;
  107. out:
  108. - acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, !IS_ERR_VALUE(ret));
  109. + acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, !ret);
  110. return ret;
  111. }
  112.  
  113. @@ -634,7 +634,7 @@ again:
  114. goto again;
  115. }
  116. }
  117. - if (IS_ERR_VALUE(ret)) {
  118. + if (ret < 0) {
  119. if (!acpi_aml_running())
  120. ret = 0;
  121. break;
  122. @@ -657,7 +657,7 @@ static int acpi_aml_write_user(const char __user *buf, int len)
  123. char *p;
  124.  
  125. ret = acpi_aml_lock_write(crc, ACPI_AML_IN_USER);
  126. - if (IS_ERR_VALUE(ret))
  127. + if (ret < 0)
  128. return ret;
  129. /* sync tail before inserting cmds */
  130. smp_mb();
  131. @@ -672,7 +672,7 @@ static int acpi_aml_write_user(const char __user *buf, int len)
  132. crc->head = (crc->head + n) & (ACPI_AML_BUF_SIZE - 1);
  133. ret = n;
  134. out:
  135. - acpi_aml_unlock_fifo(ACPI_AML_IN_USER, !IS_ERR_VALUE(ret));
  136. + acpi_aml_unlock_fifo(ACPI_AML_IN_USER, !ret);
  137. return n;
  138. }
  139.  
  140. @@ -704,7 +704,7 @@ again:
  141. goto again;
  142. }
  143. }
  144. - if (IS_ERR_VALUE(ret)) {
  145. + if (ret < 0) {
  146. if (!acpi_aml_running())
  147. ret = 0;
  148. break;
  149. diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
  150. index 8638d575b2b9..aafb8cc03523 100644
  151. --- a/drivers/ata/sata_highbank.c
  152. +++ b/drivers/ata/sata_highbank.c
  153. @@ -197,7 +197,7 @@ static void highbank_set_em_messages(struct device *dev,
  154.  
  155. for (i = 0; i < SGPIO_PINS; i++) {
  156. err = of_get_named_gpio(np, "calxeda,sgpio-gpio", i);
  157. - if (IS_ERR_VALUE(err))
  158. + if (err < 0)
  159. return;
  160.  
  161. pdata->sgpio_gpio[i] = err;
  162. diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c
  163. index b8551813ec43..456cf586d2c2 100644
  164. --- a/drivers/clk/tegra/clk-tegra210.c
  165. +++ b/drivers/clk/tegra/clk-tegra210.c
  166. @@ -1221,7 +1221,7 @@ static int tegra210_pll_fixed_mdiv_cfg(struct clk_hw *hw,
  167. p = rate >= params->vco_min ? 1 : -EINVAL;
  168. }
  169.  
  170. - if (IS_ERR_VALUE(p))
  171. + if (p < 0)
  172. return -EINVAL;
  173.  
  174. cfg->m = tegra_pll_get_fixed_mdiv(hw, input_rate);
  175. diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
  176. index cead9bec4843..376e63ca94e8 100644
  177. --- a/drivers/cpufreq/omap-cpufreq.c
  178. +++ b/drivers/cpufreq/omap-cpufreq.c
  179. @@ -54,7 +54,7 @@ static int omap_target(struct cpufreq_policy *policy, unsigned int index)
  180.  
  181. freq = new_freq * 1000;
  182. ret = clk_round_rate(policy->clk, freq);
  183. - if (IS_ERR_VALUE(ret)) {
  184. + if (ret < 0) {
  185. dev_warn(mpu_dev,
  186. "CPUfreq: Cannot find matching frequency for %lu\n",
  187. freq);
  188. diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
  189. index 44d30b45f3cc..5ad5f3009ae0 100644
  190. --- a/drivers/crypto/caam/ctrl.c
  191. +++ b/drivers/crypto/caam/ctrl.c
  192. @@ -402,7 +402,7 @@ int caam_get_era(void)
  193. ret = of_property_read_u32(caam_node, "fsl,sec-era", &prop);
  194. of_node_put(caam_node);
  195.  
  196. - return IS_ERR_VALUE(ret) ? -ENOTSUPP : prop;
  197. + return ret ? -ENOTSUPP : prop;
  198. }
  199. EXPORT_SYMBOL(caam_get_era);
  200.  
  201. diff --git a/drivers/dma/sun4i-dma.c b/drivers/dma/sun4i-dma.c
  202. index e0df233dde92..57aa227bfadb 100644
  203. --- a/drivers/dma/sun4i-dma.c
  204. +++ b/drivers/dma/sun4i-dma.c
  205. @@ -461,25 +461,25 @@ generate_ndma_promise(struct dma_chan *chan, dma_addr_t src, dma_addr_t dest,
  206.  
  207. /* Source burst */
  208. ret = convert_burst(sconfig->src_maxburst);
  209. - if (IS_ERR_VALUE(ret))
  210. + if (ret < 0)
  211. goto fail;
  212. promise->cfg |= SUN4I_DMA_CFG_SRC_BURST_LENGTH(ret);
  213.  
  214. /* Destination burst */
  215. ret = convert_burst(sconfig->dst_maxburst);
  216. - if (IS_ERR_VALUE(ret))
  217. + if (ret < 0)
  218. goto fail;
  219. promise->cfg |= SUN4I_DMA_CFG_DST_BURST_LENGTH(ret);
  220.  
  221. /* Source bus width */
  222. ret = convert_buswidth(sconfig->src_addr_width);
  223. - if (IS_ERR_VALUE(ret))
  224. + if (ret < 0)
  225. goto fail;
  226. promise->cfg |= SUN4I_DMA_CFG_SRC_DATA_WIDTH(ret);
  227.  
  228. /* Destination bus width */
  229. ret = convert_buswidth(sconfig->dst_addr_width);
  230. - if (IS_ERR_VALUE(ret))
  231. + if (ret < 0)
  232. goto fail;
  233. promise->cfg |= SUN4I_DMA_CFG_DST_DATA_WIDTH(ret);
  234.  
  235. @@ -518,25 +518,25 @@ generate_ddma_promise(struct dma_chan *chan, dma_addr_t src, dma_addr_t dest,
  236.  
  237. /* Source burst */
  238. ret = convert_burst(sconfig->src_maxburst);
  239. - if (IS_ERR_VALUE(ret))
  240. + if (ret < 0)
  241. goto fail;
  242. promise->cfg |= SUN4I_DMA_CFG_SRC_BURST_LENGTH(ret);
  243.  
  244. /* Destination burst */
  245. ret = convert_burst(sconfig->dst_maxburst);
  246. - if (IS_ERR_VALUE(ret))
  247. + if (ret < 0)
  248. goto fail;
  249. promise->cfg |= SUN4I_DMA_CFG_DST_BURST_LENGTH(ret);
  250.  
  251. /* Source bus width */
  252. ret = convert_buswidth(sconfig->src_addr_width);
  253. - if (IS_ERR_VALUE(ret))
  254. + if (ret < 0)
  255. goto fail;
  256. promise->cfg |= SUN4I_DMA_CFG_SRC_DATA_WIDTH(ret);
  257.  
  258. /* Destination bus width */
  259. ret = convert_buswidth(sconfig->dst_addr_width);
  260. - if (IS_ERR_VALUE(ret))
  261. + if (ret < 0)
  262. goto fail;
  263. promise->cfg |= SUN4I_DMA_CFG_DST_DATA_WIDTH(ret);
  264.  
  265. diff --git a/drivers/gpio/gpio-xlp.c b/drivers/gpio/gpio-xlp.c
  266. index 08897dc11915..1a33a19d95b9 100644
  267. --- a/drivers/gpio/gpio-xlp.c
  268. +++ b/drivers/gpio/gpio-xlp.c
  269. @@ -393,7 +393,7 @@ static int xlp_gpio_probe(struct platform_device *pdev)
  270. irq_base = irq_alloc_descs(-1, 0, gc->ngpio, 0);
  271. else
  272. irq_base = irq_alloc_descs(-1, XLP_GPIO_IRQ_BASE, gc->ngpio, 0);
  273. - if (IS_ERR_VALUE(irq_base)) {
  274. + if (irq_base < 0) {
  275. dev_err(&pdev->dev, "Failed to allocate IRQ numbers\n");
  276. return irq_base;
  277. }
  278. diff --git a/drivers/gpu/drm/sti/sti_vtg.c b/drivers/gpu/drm/sti/sti_vtg.c
  279. index 32c7986b63ab..6bf4ce466d20 100644
  280. --- a/drivers/gpu/drm/sti/sti_vtg.c
  281. +++ b/drivers/gpu/drm/sti/sti_vtg.c
  282. @@ -437,7 +437,7 @@ static int vtg_probe(struct platform_device *pdev)
  283. return -EPROBE_DEFER;
  284. } else {
  285. vtg->irq = platform_get_irq(pdev, 0);
  286. - if (IS_ERR_VALUE(vtg->irq)) {
  287. + if (vtg->irq < 0) {
  288. DRM_ERROR("Failed to get VTG interrupt\n");
  289. return vtg->irq;
  290. }
  291. @@ -447,7 +447,7 @@ static int vtg_probe(struct platform_device *pdev)
  292. ret = devm_request_threaded_irq(dev, vtg->irq, vtg_irq,
  293. vtg_irq_thread, IRQF_ONESHOT,
  294. dev_name(dev), vtg);
  295. - if (IS_ERR_VALUE(ret)) {
  296. + if (ret < 0) {
  297. DRM_ERROR("Failed to register VTG interrupt\n");
  298. return ret;
  299. }
  300. diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
  301. index 7716f42f8aab..6b8c5b3bf588 100644
  302. --- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
  303. +++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
  304. @@ -342,7 +342,7 @@ static int tfp410_probe(struct platform_device *pdev)
  305.  
  306. tfp410_mod->gpio = of_get_named_gpio_flags(node, "powerdn-gpio",
  307. 0, NULL);
  308. - if (IS_ERR_VALUE(tfp410_mod->gpio)) {
  309. + if (tfp410_mod->gpio < 0) {
  310. dev_warn(&pdev->dev, "No power down GPIO\n");
  311. } else {
  312. ret = gpio_request(tfp410_mod->gpio, "DVI_PDn");
  313. diff --git a/drivers/gpu/host1x/hw/intr_hw.c b/drivers/gpu/host1x/hw/intr_hw.c
  314. index 498b37e39058..e1e31e9e67cd 100644
  315. --- a/drivers/gpu/host1x/hw/intr_hw.c
  316. +++ b/drivers/gpu/host1x/hw/intr_hw.c
  317. @@ -85,7 +85,7 @@ static int _host1x_intr_init_host_sync(struct host1x *host, u32 cpm,
  318. err = devm_request_irq(host->dev, host->intr_syncpt_irq,
  319. syncpt_thresh_isr, IRQF_SHARED,
  320. "host1x_syncpt", host);
  321. - if (IS_ERR_VALUE(err)) {
  322. + if (err < 0) {
  323. WARN_ON(1);
  324. return err;
  325. }
  326. diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
  327. index ebab33e77d67..94b68213c50d 100644
  328. --- a/drivers/iommu/arm-smmu-v3.c
  329. +++ b/drivers/iommu/arm-smmu-v3.c
  330. @@ -1477,7 +1477,7 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain,
  331. struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg;
  332.  
  333. asid = arm_smmu_bitmap_alloc(smmu->asid_map, smmu->asid_bits);
  334. - if (IS_ERR_VALUE(asid))
  335. + if (asid < 0)
  336. return asid;
  337.  
  338. cfg->cdptr = dmam_alloc_coherent(smmu->dev, CTXDESC_CD_DWORDS << 3,
  339. @@ -1508,7 +1508,7 @@ static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain,
  340. struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg;
  341.  
  342. vmid = arm_smmu_bitmap_alloc(smmu->vmid_map, smmu->vmid_bits);
  343. - if (IS_ERR_VALUE(vmid))
  344. + if (vmid < 0)
  345. return vmid;
  346.  
  347. cfg->vmid = (u16)vmid;
  348. @@ -1569,7 +1569,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain)
  349. smmu_domain->pgtbl_ops = pgtbl_ops;
  350.  
  351. ret = finalise_stage_fn(smmu_domain, &pgtbl_cfg);
  352. - if (IS_ERR_VALUE(ret))
  353. + if (ret < 0)
  354. free_io_pgtable_ops(pgtbl_ops);
  355.  
  356. return ret;
  357. @@ -1642,7 +1642,7 @@ static void arm_smmu_detach_dev(struct device *dev)
  358. struct arm_smmu_group *smmu_group = arm_smmu_group_get(dev);
  359.  
  360. smmu_group->ste.bypass = true;
  361. - if (IS_ERR_VALUE(arm_smmu_install_ste_for_group(smmu_group)))
  362. + if (arm_smmu_install_ste_for_group(smmu_group) < 0)
  363. dev_warn(dev, "failed to install bypass STE\n");
  364.  
  365. smmu_group->domain = NULL;
  366. @@ -1694,7 +1694,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
  367. smmu_group->ste.bypass = domain->type == IOMMU_DOMAIN_DMA;
  368.  
  369. ret = arm_smmu_install_ste_for_group(smmu_group);
  370. - if (IS_ERR_VALUE(ret))
  371. + if (ret < 0)
  372. smmu_group->domain = NULL;
  373.  
  374. out_unlock:
  375. @@ -2235,7 +2235,7 @@ static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
  376. arm_smmu_evtq_handler,
  377. arm_smmu_evtq_thread,
  378. 0, "arm-smmu-v3-evtq", smmu);
  379. - if (IS_ERR_VALUE(ret))
  380. + if (ret < 0)
  381. dev_warn(smmu->dev, "failed to enable evtq irq\n");
  382. }
  383.  
  384. @@ -2244,7 +2244,7 @@ static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
  385. ret = devm_request_irq(smmu->dev, irq,
  386. arm_smmu_cmdq_sync_handler, 0,
  387. "arm-smmu-v3-cmdq-sync", smmu);
  388. - if (IS_ERR_VALUE(ret))
  389. + if (ret < 0)
  390. dev_warn(smmu->dev, "failed to enable cmdq-sync irq\n");
  391. }
  392.  
  393. @@ -2252,7 +2252,7 @@ static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
  394. if (irq) {
  395. ret = devm_request_irq(smmu->dev, irq, arm_smmu_gerror_handler,
  396. 0, "arm-smmu-v3-gerror", smmu);
  397. - if (IS_ERR_VALUE(ret))
  398. + if (ret < 0)
  399. dev_warn(smmu->dev, "failed to enable gerror irq\n");
  400. }
  401.  
  402. @@ -2264,7 +2264,7 @@ static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
  403. arm_smmu_priq_thread,
  404. 0, "arm-smmu-v3-priq",
  405. smmu);
  406. - if (IS_ERR_VALUE(ret))
  407. + if (ret < 0)
  408. dev_warn(smmu->dev,
  409. "failed to enable priq irq\n");
  410. else
  411. diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
  412. index e206ce7a4e4b..9345a3fcb706 100644
  413. --- a/drivers/iommu/arm-smmu.c
  414. +++ b/drivers/iommu/arm-smmu.c
  415. @@ -950,7 +950,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
  416.  
  417. ret = __arm_smmu_alloc_bitmap(smmu->context_map, start,
  418. smmu->num_context_banks);
  419. - if (IS_ERR_VALUE(ret))
  420. + if (ret < 0)
  421. goto out_unlock;
  422.  
  423. cfg->cbndx = ret;
  424. @@ -989,7 +989,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
  425. irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx];
  426. ret = request_irq(irq, arm_smmu_context_fault, IRQF_SHARED,
  427. "arm-smmu-context-fault", domain);
  428. - if (IS_ERR_VALUE(ret)) {
  429. + if (ret < 0) {
  430. dev_err(smmu->dev, "failed to request context IRQ %d (%u)\n",
  431. cfg->irptndx, irq);
  432. cfg->irptndx = INVALID_IRPTNDX;
  433. @@ -1099,7 +1099,7 @@ static int arm_smmu_master_configure_smrs(struct arm_smmu_device *smmu,
  434. for (i = 0; i < cfg->num_streamids; ++i) {
  435. int idx = __arm_smmu_alloc_bitmap(smmu->smr_map, 0,
  436. smmu->num_mapping_groups);
  437. - if (IS_ERR_VALUE(idx)) {
  438. + if (idx < 0) {
  439. dev_err(smmu->dev, "failed to allocate free SMR\n");
  440. goto err_free_smrs;
  441. }
  442. @@ -1233,7 +1233,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
  443.  
  444. /* Ensure that the domain is finalised */
  445. ret = arm_smmu_init_domain_context(domain, smmu);
  446. - if (IS_ERR_VALUE(ret))
  447. + if (ret < 0)
  448. return ret;
  449.  
  450. /*
  451. diff --git a/drivers/irqchip/irq-clps711x.c b/drivers/irqchip/irq-clps711x.c
  452. index eb5eb0cd414d..2223b3f15d68 100644
  453. --- a/drivers/irqchip/irq-clps711x.c
  454. +++ b/drivers/irqchip/irq-clps711x.c
  455. @@ -182,7 +182,7 @@ static int __init _clps711x_intc_init(struct device_node *np,
  456. writel_relaxed(0, clps711x_intc->intmr[2]);
  457.  
  458. err = irq_alloc_descs(-1, 0, ARRAY_SIZE(clps711x_irqs), numa_node_id());
  459. - if (IS_ERR_VALUE(err))
  460. + if (err < 0)
  461. goto out_iounmap;
  462.  
  463. clps711x_intc->ops.map = clps711x_intc_irq_map;
  464. diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
  465. index b4e647179346..fbc4ae2afd29 100644
  466. --- a/drivers/irqchip/irq-gic.c
  467. +++ b/drivers/irqchip/irq-gic.c
  468. @@ -1123,7 +1123,7 @@ static int __init __gic_init_bases(struct gic_chip_data *gic, int irq_start,
  469.  
  470. irq_base = irq_alloc_descs(irq_start, 16, gic_irqs,
  471. numa_node_id());
  472. - if (IS_ERR_VALUE(irq_base)) {
  473. + if (irq_base < 0) {
  474. WARN(1, "Cannot allocate irq_descs @ IRQ%d, assuming pre-allocated\n",
  475. irq_start);
  476. irq_base = irq_start;
  477. diff --git a/drivers/irqchip/irq-hip04.c b/drivers/irqchip/irq-hip04.c
  478. index 9688d2e2a636..9e25d8ce08e5 100644
  479. --- a/drivers/irqchip/irq-hip04.c
  480. +++ b/drivers/irqchip/irq-hip04.c
  481. @@ -402,7 +402,7 @@ hip04_of_init(struct device_node *node, struct device_node *parent)
  482. nr_irqs -= hwirq_base; /* calculate # of irqs to allocate */
  483.  
  484. irq_base = irq_alloc_descs(-1, hwirq_base, nr_irqs, numa_node_id());
  485. - if (IS_ERR_VALUE(irq_base)) {
  486. + if (irq_base < 0) {
  487. pr_err("failed to allocate IRQ numbers\n");
  488. return -EINVAL;
  489. }
  490. diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c
  491. index 1ccd2abed65f..1518ba31a80c 100644
  492. --- a/drivers/irqchip/spear-shirq.c
  493. +++ b/drivers/irqchip/spear-shirq.c
  494. @@ -232,7 +232,7 @@ static int __init shirq_init(struct spear_shirq **shirq_blocks, int block_nr,
  495. nr_irqs += shirq_blocks[i]->nr_irqs;
  496.  
  497. virq_base = irq_alloc_descs(-1, 0, nr_irqs, 0);
  498. - if (IS_ERR_VALUE(virq_base)) {
  499. + if (virq_base < 0) {
  500. pr_err("%s: irq desc alloc failed\n", __func__);
  501. goto err_unmap;
  502. }
  503. diff --git a/drivers/media/i2c/adp1653.c b/drivers/media/i2c/adp1653.c
  504. index 9e1731c565e7..e191e295c951 100644
  505. --- a/drivers/media/i2c/adp1653.c
  506. +++ b/drivers/media/i2c/adp1653.c
  507. @@ -95,7 +95,7 @@ static int adp1653_get_fault(struct adp1653_flash *flash)
  508. int rval;
  509.  
  510. fault = i2c_smbus_read_byte_data(client, ADP1653_REG_FAULT);
  511. - if (IS_ERR_VALUE(fault))
  512. + if (fault < 0)
  513. return fault;
  514.  
  515. flash->fault |= fault;
  516. @@ -105,13 +105,13 @@ static int adp1653_get_fault(struct adp1653_flash *flash)
  517.  
  518. /* Clear faults. */
  519. rval = i2c_smbus_write_byte_data(client, ADP1653_REG_OUT_SEL, 0);
  520. - if (IS_ERR_VALUE(rval))
  521. + if (rval < 0)
  522. return rval;
  523.  
  524. flash->led_mode->val = V4L2_FLASH_LED_MODE_NONE;
  525.  
  526. rval = adp1653_update_hw(flash);
  527. - if (IS_ERR_VALUE(rval))
  528. + if (rval)
  529. return rval;
  530.  
  531. return flash->fault;
  532. @@ -158,7 +158,7 @@ static int adp1653_get_ctrl(struct v4l2_ctrl *ctrl)
  533. int rval;
  534.  
  535. rval = adp1653_get_fault(flash);
  536. - if (IS_ERR_VALUE(rval))
  537. + if (rval)
  538. return rval;
  539.  
  540. ctrl->cur.val = 0;
  541. @@ -184,7 +184,7 @@ static int adp1653_set_ctrl(struct v4l2_ctrl *ctrl)
  542. int rval;
  543.  
  544. rval = adp1653_get_fault(flash);
  545. - if (IS_ERR_VALUE(rval))
  546. + if (rval)
  547. return rval;
  548. if ((rval & (ADP1653_REG_FAULT_FLT_SCP |
  549. ADP1653_REG_FAULT_FLT_OT |
  550. diff --git a/drivers/media/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c
  551. index 5ef67774971d..8a5d19469ddc 100644
  552. --- a/drivers/media/platform/s5p-tv/mixer_drv.c
  553. +++ b/drivers/media/platform/s5p-tv/mixer_drv.c
  554. @@ -146,7 +146,7 @@ int mxr_power_get(struct mxr_device *mdev)
  555.  
  556. /* returning 1 means that power is already enabled,
  557. * so zero success be returned */
  558. - if (IS_ERR_VALUE(ret))
  559. + if (ret < 0)
  560. return ret;
  561. return 0;
  562. }
  563. diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
  564. index 40e51b0baa46..b46c0cfc27d9 100644
  565. --- a/drivers/mfd/twl4030-irq.c
  566. +++ b/drivers/mfd/twl4030-irq.c
  567. @@ -696,7 +696,7 @@ int twl4030_init_irq(struct device *dev, int irq_num)
  568. nr_irqs = TWL4030_PWR_NR_IRQS + TWL4030_CORE_NR_IRQS;
  569.  
  570. irq_base = irq_alloc_descs(-1, 0, nr_irqs, 0);
  571. - if (IS_ERR_VALUE(irq_base)) {
  572. + if (irq_base < 0) {
  573. dev_err(dev, "Fail to allocate IRQ descs\n");
  574. return irq_base;
  575. }
  576. diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
  577. index b81b08f81325..c984321d1881 100644
  578. --- a/drivers/mmc/core/mmc.c
  579. +++ b/drivers/mmc/core/mmc.c
  580. @@ -1276,7 +1276,7 @@ static int mmc_select_hs200(struct mmc_card *card)
  581. * switch to HS200 mode if bus width is set successfully.
  582. */
  583. err = mmc_select_bus_width(card);
  584. - if (!IS_ERR_VALUE(err)) {
  585. + if (!err) {
  586. val = EXT_CSD_TIMING_HS200 |
  587. card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
  588. err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
  589. @@ -1583,7 +1583,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
  590. } else if (mmc_card_hs(card)) {
  591. /* Select the desired bus width optionally */
  592. err = mmc_select_bus_width(card);
  593. - if (!IS_ERR_VALUE(err)) {
  594. + if (!err) {
  595. err = mmc_select_hs_ddr(card);
  596. if (err)
  597. goto free_card;
  598. diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
  599. index 829a6eebcdce..2cc6123b1df9 100644
  600. --- a/drivers/mmc/host/dw_mmc.c
  601. +++ b/drivers/mmc/host/dw_mmc.c
  602. @@ -1431,7 +1431,7 @@ static int dw_mci_get_ro(struct mmc_host *mmc)
  603. int gpio_ro = mmc_gpio_get_ro(mmc);
  604.  
  605. /* Use platform get_ro function, else try on board write protect */
  606. - if (!IS_ERR_VALUE(gpio_ro))
  607. + if (gpio_ro >= 0)
  608. read_only = gpio_ro;
  609. else
  610. read_only =
  611. @@ -1454,7 +1454,7 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
  612. if ((mmc->caps & MMC_CAP_NEEDS_POLL) ||
  613. (mmc->caps & MMC_CAP_NONREMOVABLE))
  614. present = 1;
  615. - else if (!IS_ERR_VALUE(gpio_cd))
  616. + else if (gpio_cd >= 0)
  617. present = gpio_cd;
  618. else
  619. present = (mci_readl(slot->host, CDETECT) & (1 << slot->id))
  620. @@ -2927,7 +2927,7 @@ static void dw_mci_enable_cd(struct dw_mci *host)
  621. if (slot->mmc->caps & MMC_CAP_NEEDS_POLL)
  622. return;
  623.  
  624. - if (IS_ERR_VALUE(mmc_gpio_get_cd(slot->mmc)))
  625. + if (mmc_gpio_get_cd(slot->mmc) < 0)
  626. break;
  627. }
  628. if (i == host->num_slots)
  629. diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
  630. index 2d300d87cda8..9d3ae1f4bd3c 100644
  631. --- a/drivers/mmc/host/sdhci-esdhc-imx.c
  632. +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
  633. @@ -1011,7 +1011,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
  634. if (ret)
  635. return ret;
  636.  
  637. - if (!IS_ERR_VALUE(mmc_gpio_get_cd(host->mmc)))
  638. + if (mmc_gpio_get_cd(host->mmc) >= 0)
  639. host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
  640.  
  641. return 0;
  642. diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
  643. index 25f779e09d8e..d4cef713d246 100644
  644. --- a/drivers/mmc/host/sdhci-of-at91.c
  645. +++ b/drivers/mmc/host/sdhci-of-at91.c
  646. @@ -289,7 +289,7 @@ static int sdhci_at91_probe(struct platform_device *pdev)
  647. * to enable polling via device tree with broken-cd property.
  648. */
  649. if (!(host->mmc->caps & MMC_CAP_NONREMOVABLE) &&
  650. - IS_ERR_VALUE(mmc_gpio_get_cd(host->mmc))) {
  651. + mmc_gpio_get_cd(host->mmc) < 0) {
  652. host->mmc->caps |= MMC_CAP_NEEDS_POLL;
  653. host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
  654. }
  655. diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
  656. index e010ea4eb6f5..0e3d7c056cb1 100644
  657. --- a/drivers/mmc/host/sdhci.c
  658. +++ b/drivers/mmc/host/sdhci.c
  659. @@ -1624,7 +1624,7 @@ static int sdhci_get_cd(struct mmc_host *mmc)
  660. * Try slot gpio detect, if defined it take precedence
  661. * over build in controller functionality
  662. */
  663. - if (!IS_ERR_VALUE(gpio_cd))
  664. + if (gpio_cd >= 0)
  665. return !!gpio_cd;
  666.  
  667. /* If polling, assume that the card is always present. */
  668. @@ -3077,7 +3077,7 @@ int sdhci_add_host(struct sdhci_host *host)
  669.  
  670. if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) &&
  671. !(mmc->caps & MMC_CAP_NONREMOVABLE) &&
  672. - IS_ERR_VALUE(mmc_gpio_get_cd(host->mmc)))
  673. + mmc_gpio_get_cd(host->mmc) < 0)
  674. mmc->caps |= MMC_CAP_NEEDS_POLL;
  675.  
  676. /* If there are external regulators, get them */
  677. diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
  678. index bcb9dccada4d..1de2e1e51c2b 100644
  679. --- a/drivers/net/ethernet/freescale/fman/fman.c
  680. +++ b/drivers/net/ethernet/freescale/fman/fman.c
  681. @@ -615,7 +615,7 @@ struct fman {
  682. struct fman_cfg *cfg;
  683. struct muram_info *muram;
  684. /* cam section in muram */
  685. - int cam_offset;
  686. + unsigned long cam_offset;
  687. size_t cam_size;
  688. /* Fifo in MURAM */
  689. int fifo_offset;
  690. diff --git a/drivers/net/ethernet/freescale/fman/fman_muram.c b/drivers/net/ethernet/freescale/fman/fman_muram.c
  691. index 4eb0e9ac7182..47394c45b6e8 100644
  692. --- a/drivers/net/ethernet/freescale/fman/fman_muram.c
  693. +++ b/drivers/net/ethernet/freescale/fman/fman_muram.c
  694. @@ -129,7 +129,7 @@ unsigned long fman_muram_offset_to_vbase(struct muram_info *muram,
  695. *
  696. * Return: address of the allocated memory; NULL otherwise.
  697. */
  698. -int fman_muram_alloc(struct muram_info *muram, size_t size)
  699. +unsigned long fman_muram_alloc(struct muram_info *muram, size_t size)
  700. {
  701. unsigned long vaddr;
  702.  
  703. @@ -150,7 +150,7 @@ int fman_muram_alloc(struct muram_info *muram, size_t size)
  704. *
  705. * Free an allocated memory from FM-MURAM partition.
  706. */
  707. -void fman_muram_free_mem(struct muram_info *muram, u32 offset, size_t size)
  708. +void fman_muram_free_mem(struct muram_info *muram, unsigned long offset, size_t size)
  709. {
  710. unsigned long addr = fman_muram_offset_to_vbase(muram, offset);
  711.  
  712. diff --git a/drivers/net/ethernet/freescale/fman/fman_muram.h b/drivers/net/ethernet/freescale/fman/fman_muram.h
  713. index dbf0af9e5bb5..889649ad8931 100644
  714. --- a/drivers/net/ethernet/freescale/fman/fman_muram.h
  715. +++ b/drivers/net/ethernet/freescale/fman/fman_muram.h
  716. @@ -44,8 +44,8 @@ struct muram_info *fman_muram_init(phys_addr_t base, size_t size);
  717. unsigned long fman_muram_offset_to_vbase(struct muram_info *muram,
  718. unsigned long offset);
  719.  
  720. -int fman_muram_alloc(struct muram_info *muram, size_t size);
  721. +unsigned long fman_muram_alloc(struct muram_info *muram, size_t size);
  722.  
  723. -void fman_muram_free_mem(struct muram_info *muram, u32 offset, size_t size);
  724. +void fman_muram_free_mem(struct muram_info *muram, unsigned long offset, size_t size);
  725.  
  726. #endif /* __FM_MURAM_EXT */
  727. diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
  728. index 020ac1a4b408..cea9443c22a6 100644
  729. --- a/drivers/net/wireless/ti/wlcore/spi.c
  730. +++ b/drivers/net/wireless/ti/wlcore/spi.c
  731. @@ -382,7 +382,7 @@ static int wlcore_probe_of(struct spi_device *spi, struct wl12xx_spi_glue *glue,
  732.  
  733. ret = of_property_read_u32(dt_node, "ref-clock-frequency",
  734. &pdev_data->ref_clock_freq);
  735. - if (IS_ERR_VALUE(ret)) {
  736. + if (ret) {
  737. dev_err(glue->dev,
  738. "can't get reference clock frequency (%d)\n", ret);
  739. return ret;
  740. @@ -425,7 +425,7 @@ static int wl1271_probe(struct spi_device *spi)
  741. }
  742.  
  743. ret = wlcore_probe_of(spi, glue, &pdev_data);
  744. - if (IS_ERR_VALUE(ret)) {
  745. + if (ret) {
  746. dev_err(glue->dev,
  747. "can't get device tree parameters (%d)\n", ret);
  748. return ret;
  749. diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
  750. index bb4ea123547f..965911d9b36a 100644
  751. --- a/drivers/nvmem/core.c
  752. +++ b/drivers/nvmem/core.c
  753. @@ -113,7 +113,7 @@ static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj,
  754.  
  755. rc = nvmem_reg_read(nvmem, pos, buf, count);
  756.  
  757. - if (IS_ERR_VALUE(rc))
  758. + if (rc)
  759. return rc;
  760.  
  761. return count;
  762. @@ -147,7 +147,7 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,
  763.  
  764. rc = nvmem_reg_write(nvmem, pos, buf, count);
  765.  
  766. - if (IS_ERR_VALUE(rc))
  767. + if (rc)
  768. return rc;
  769.  
  770. return count;
  771. @@ -366,7 +366,7 @@ static int nvmem_add_cells(struct nvmem_device *nvmem,
  772. }
  773.  
  774. rval = nvmem_cell_info_to_nvmem_cell(nvmem, &info[i], cells[i]);
  775. - if (IS_ERR_VALUE(rval)) {
  776. + if (rval) {
  777. kfree(cells[i]);
  778. goto err;
  779. }
  780. @@ -963,7 +963,7 @@ static int __nvmem_cell_read(struct nvmem_device *nvmem,
  781.  
  782. rc = nvmem_reg_read(nvmem, cell->offset, buf, cell->bytes);
  783.  
  784. - if (IS_ERR_VALUE(rc))
  785. + if (rc)
  786. return rc;
  787.  
  788. /* shift bits in-place */
  789. @@ -998,7 +998,7 @@ void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
  790. return ERR_PTR(-ENOMEM);
  791.  
  792. rc = __nvmem_cell_read(nvmem, cell, buf, len);
  793. - if (IS_ERR_VALUE(rc)) {
  794. + if (rc) {
  795. kfree(buf);
  796. return ERR_PTR(rc);
  797. }
  798. @@ -1083,7 +1083,7 @@ int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len)
  799. if (cell->bit_offset || cell->nbits)
  800. kfree(buf);
  801.  
  802. - if (IS_ERR_VALUE(rc))
  803. + if (rc)
  804. return rc;
  805.  
  806. return len;
  807. @@ -1111,11 +1111,11 @@ ssize_t nvmem_device_cell_read(struct nvmem_device *nvmem,
  808. return -EINVAL;
  809.  
  810. rc = nvmem_cell_info_to_nvmem_cell(nvmem, info, &cell);
  811. - if (IS_ERR_VALUE(rc))
  812. + if (rc)
  813. return rc;
  814.  
  815. rc = __nvmem_cell_read(nvmem, &cell, buf, &len);
  816. - if (IS_ERR_VALUE(rc))
  817. + if (rc)
  818. return rc;
  819.  
  820. return len;
  821. @@ -1141,7 +1141,7 @@ int nvmem_device_cell_write(struct nvmem_device *nvmem,
  822. return -EINVAL;
  823.  
  824. rc = nvmem_cell_info_to_nvmem_cell(nvmem, info, &cell);
  825. - if (IS_ERR_VALUE(rc))
  826. + if (rc)
  827. return rc;
  828.  
  829. return nvmem_cell_write(&cell, buf, cell.bytes);
  830. @@ -1170,7 +1170,7 @@ int nvmem_device_read(struct nvmem_device *nvmem,
  831.  
  832. rc = nvmem_reg_read(nvmem, offset, buf, bytes);
  833.  
  834. - if (IS_ERR_VALUE(rc))
  835. + if (rc)
  836. return rc;
  837.  
  838. return bytes;
  839. @@ -1198,7 +1198,7 @@ int nvmem_device_write(struct nvmem_device *nvmem,
  840.  
  841. rc = nvmem_reg_write(nvmem, offset, buf, bytes);
  842.  
  843. - if (IS_ERR_VALUE(rc))
  844. + if (rc)
  845. return rc;
  846.  
  847.  
  848. diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
  849. index a2aa655f56c4..1b7331e40d79 100644
  850. --- a/drivers/tty/serial/amba-pl011.c
  851. +++ b/drivers/tty/serial/amba-pl011.c
  852. @@ -2360,7 +2360,7 @@ static int pl011_probe_dt_alias(int index, struct device *dev)
  853. return ret;
  854.  
  855. ret = of_alias_get_id(np, "serial");
  856. - if (IS_ERR_VALUE(ret)) {
  857. + if (ret < 0) {
  858. seen_dev_without_alias = true;
  859. ret = index;
  860. } else {
  861. diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c
  862. index 18971063f95f..699447aa8b43 100644
  863. --- a/drivers/tty/serial/sprd_serial.c
  864. +++ b/drivers/tty/serial/sprd_serial.c
  865. @@ -654,7 +654,7 @@ static int sprd_probe_dt_alias(int index, struct device *dev)
  866. return ret;
  867.  
  868. ret = of_alias_get_id(np, "serial");
  869. - if (IS_ERR_VALUE(ret))
  870. + if (ret < 0)
  871. ret = index;
  872. else if (ret >= ARRAY_SIZE(sprd_port) || sprd_port[ret] != NULL) {
  873. dev_warn(dev, "requested serial port %d not available.\n", ret);
  874. diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
  875. index d8d583d32a37..c229b1a0d13b 100644
  876. --- a/drivers/video/fbdev/da8xx-fb.c
  877. +++ b/drivers/video/fbdev/da8xx-fb.c
  878. @@ -713,7 +713,7 @@ static int da8xx_fb_config_clk_divider(struct da8xx_fb_par *par,
  879.  
  880. if (par->lcdc_clk_rate != lcdc_clk_rate) {
  881. ret = clk_set_rate(par->lcdc_clk, lcdc_clk_rate);
  882. - if (IS_ERR_VALUE(ret)) {
  883. + if (ret) {
  884. dev_err(par->dev,
  885. "unable to set clock rate at %u\n",
  886. lcdc_clk_rate);
  887. @@ -784,7 +784,7 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
  888. int ret = 0;
  889.  
  890. ret = da8xx_fb_calc_config_clk_divider(par, panel);
  891. - if (IS_ERR_VALUE(ret)) {
  892. + if (ret) {
  893. dev_err(par->dev, "unable to configure clock\n");
  894. return ret;
  895. }
  896. diff --git a/fs/afs/write.c b/fs/afs/write.c
  897. index 65de439bdc4f..14d506efd1aa 100644
  898. --- a/fs/afs/write.c
  899. +++ b/fs/afs/write.c
  900. @@ -643,10 +643,6 @@ ssize_t afs_file_write(struct kiocb *iocb, struct iov_iter *from)
  901. return 0;
  902.  
  903. result = generic_file_write_iter(iocb, from);
  904. - if (IS_ERR_VALUE(result)) {
  905. - _leave(" = %zd", result);
  906. - return result;
  907. - }
  908.  
  909. _leave(" = %zd", result);
  910. return result;
  911. diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
  912. index f723cd3a455c..75363cf88fb8 100644
  913. --- a/fs/binfmt_flat.c
  914. +++ b/fs/binfmt_flat.c
  915. @@ -337,7 +337,7 @@ calc_reloc(unsigned long r, struct lib_info *p, int curid, int internalp)
  916. "(%d != %d)", (unsigned) r, curid, id);
  917. goto failed;
  918. } else if ( ! p->lib_list[id].loaded &&
  919. - IS_ERR_VALUE(load_flat_shared_library(id, p))) {
  920. + load_flat_shared_library(id, p) < 0) {
  921. printk("BINFMT_FLAT: failed to load library %d", id);
  922. goto failed;
  923. }
  924. @@ -837,7 +837,7 @@ static int load_flat_shared_library(int id, struct lib_info *libs)
  925.  
  926. res = prepare_binprm(&bprm);
  927.  
  928. - if (!IS_ERR_VALUE(res))
  929. + if (res >= 0)
  930. res = load_flat_file(&bprm, libs, id, NULL);
  931.  
  932. abort_creds(bprm.cred);
  933. @@ -883,7 +883,7 @@ static int load_flat_binary(struct linux_binprm * bprm)
  934. stack_len += FLAT_STACK_ALIGN - 1; /* reserve for upcoming alignment */
  935.  
  936. res = load_flat_file(bprm, &libinfo, 0, &stack_len);
  937. - if (IS_ERR_VALUE(res))
  938. + if (res < 0)
  939. return res;
  940.  
  941. /* Update data segment pointers for all libraries */
  942. diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
  943. index 4a01f30e9995..271d93905bac 100644
  944. --- a/fs/gfs2/dir.c
  945. +++ b/fs/gfs2/dir.c
  946. @@ -783,12 +783,15 @@ static int get_leaf_nr(struct gfs2_inode *dip, u32 index,
  947. u64 *leaf_out)
  948. {
  949. __be64 *hash;
  950. + int error;
  951.  
  952. hash = gfs2_dir_get_hash_table(dip);
  953. - if (IS_ERR(hash))
  954. - return PTR_ERR(hash);
  955. - *leaf_out = be64_to_cpu(*(hash + index));
  956. - return 0;
  957. + error = PTR_ERR_OR_ZERO(hash);
  958. +
  959. + if (!error)
  960. + *leaf_out = be64_to_cpu(*(hash + index));
  961. +
  962. + return error;
  963. }
  964.  
  965. static int get_first_leaf(struct gfs2_inode *dip, u32 index,
  966. @@ -798,7 +801,7 @@ static int get_first_leaf(struct gfs2_inode *dip, u32 index,
  967. int error;
  968.  
  969. error = get_leaf_nr(dip, index, &leaf_no);
  970. - if (!IS_ERR_VALUE(error))
  971. + if (!error)
  972. error = get_leaf(dip, leaf_no, bh_out);
  973.  
  974. return error;
  975. @@ -1014,7 +1017,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name)
  976.  
  977. index = name->hash >> (32 - dip->i_depth);
  978. error = get_leaf_nr(dip, index, &leaf_no);
  979. - if (IS_ERR_VALUE(error))
  980. + if (error)
  981. return error;
  982.  
  983. /* Get the old leaf block */
  984. diff --git a/include/linux/err.h b/include/linux/err.h
  985. index 56762ab41713..141869e450a4 100644
  986. --- a/include/linux/err.h
  987. +++ b/include/linux/err.h
  988. @@ -18,7 +18,8 @@
  989.  
  990. #ifndef __ASSEMBLY__
  991.  
  992. -#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
  993. +#define IS_ERR_VALUE(x) ((unsigned long*)NULL == (typeof (x)*)NULL && \
  994. + unlikely((unsigned long long)(x) >= (unsigned long long)(typeof(x))-MAX_ERRNO))
  995.  
  996. static inline void * __must_check ERR_PTR(long error)
  997. {
  998. diff --git a/kernel/pid.c b/kernel/pid.c
  999. index 4d73a834c7e6..f66162f2359b 100644
  1000. --- a/kernel/pid.c
  1001. +++ b/kernel/pid.c
  1002. @@ -311,7 +311,7 @@ struct pid *alloc_pid(struct pid_namespace *ns)
  1003. pid->level = ns->level;
  1004. for (i = ns->level; i >= 0; i--) {
  1005. nr = alloc_pidmap(tmp);
  1006. - if (IS_ERR_VALUE(nr)) {
  1007. + if (nr < 0) {
  1008. retval = nr;
  1009. goto out_free;
  1010. }
  1011. diff --git a/net/9p/client.c b/net/9p/client.c
  1012. index ea79ee9a7348..7f6760ef7897 100644
  1013. --- a/net/9p/client.c
  1014. +++ b/net/9p/client.c
  1015. @@ -521,7 +521,7 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)
  1016. if (p9_is_proto_dotu(c))
  1017. err = -ecode;
  1018.  
  1019. - if (!err || !IS_ERR_VALUE(err)) {
  1020. + if (!err || !IS_ERR_VALUE((unsigned long)err)) {
  1021. err = p9_errstr2errno(ename, strlen(ename));
  1022.  
  1023. p9_debug(P9_DEBUG_9P, "<<< RERROR (%d) %s\n",
  1024. @@ -608,7 +608,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
  1025. if (p9_is_proto_dotu(c))
  1026. err = -ecode;
  1027.  
  1028. - if (!err || !IS_ERR_VALUE(err)) {
  1029. + if (!err || !IS_ERR_VALUE((unsigned long)err)) {
  1030. err = p9_errstr2errno(ename, strlen(ename));
  1031.  
  1032. p9_debug(P9_DEBUG_9P, "<<< RERROR (%d) %s\n",
  1033. diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
  1034. index 6e8665430bd5..ddfe34434765 100644
  1035. --- a/sound/soc/qcom/lpass-platform.c
  1036. +++ b/sound/soc/qcom/lpass-platform.c
  1037. @@ -491,7 +491,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
  1038. data->rdma_ch = v->alloc_dma_channel(drvdata,
  1039. SNDRV_PCM_STREAM_PLAYBACK);
  1040.  
  1041. - if (IS_ERR_VALUE(data->rdma_ch))
  1042. + if (data->rdma_ch < 0)
  1043. return data->rdma_ch;
  1044.  
  1045. drvdata->substream[data->rdma_ch] = psubstream;
  1046. @@ -518,7 +518,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
  1047. data->wrdma_ch = v->alloc_dma_channel(drvdata,
  1048. SNDRV_PCM_STREAM_CAPTURE);
  1049.  
  1050. - if (IS_ERR_VALUE(data->wrdma_ch))
  1051. + if (data->wrdma_ch < 0)
  1052. goto capture_alloc_err;
  1053.  
  1054. drvdata->substream[data->wrdma_ch] = csubstream;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!