Commit 45586c70 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Torvalds
Browse files

treewide: remove redundant IS_ERR() before error code check 

'PTR_ERR(p) == -E*' is a stronger condition than IS_ERR(p).
Hence, IS_ERR(p) is unneeded.

The semantic patch that generates this commit is as follows:

// <smpl>
@@
expression ptr;
constant error_code;
@@
-IS_ERR(ptr) && (PTR_ERR(ptr) == - error_code)
+PTR_ERR(ptr) == - error_code
// </smpl>

Link: http://lkml.kernel.org/r/20200106045833.1725-1-masahiroy@kernel.org


Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Acked-by: Stephen Boyd <sboyd@kernel.org> [drivers/clk/clk.c]
Acked-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> [GPIO]
Acked-by: Wolfram Sang <wsa@the-dreams.de> [drivers/i2c]
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> [acpi/scan.c]
Acked-by: default avatarRob Herring <robh@kernel.org>
Cc: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 190535f7

crypto/af_alg.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
	sa->salg_name[sizeof(sa->salg_name) + addr_len - sizeof(*sa) - 1] = 0;



	type = alg_get_type(sa->salg_type);

	if (IS_ERR(type) && PTR_ERR(type) == -ENOENT) {

	if (PTR_ERR(type) == -ENOENT) {

		request_module("algif-%s", sa->salg_type);

		type = alg_get_type(sa->salg_type);

	}

drivers/acpi/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -1462,7 +1462,7 @@ int acpi_dma_configure(struct device *dev, enum dev_dma_attr attr) 
	iort_dma_setup(dev, &dma_addr, &size);



	iommu = iort_iommu_configure(dev);

	if (IS_ERR(iommu) && PTR_ERR(iommu) == -EPROBE_DEFER)

	if (PTR_ERR(iommu) == -EPROBE_DEFER)

		return -EPROBE_DEFER;



	arch_setup_dma_ops(dev, dma_addr, size,

drivers/char/hw_random/bcm2835-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int bcm2835_rng_probe(struct platform_device *pdev) 


	/* Clock is optional on most platforms */

	priv->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(priv->clk) && PTR_ERR(priv->clk) == -EPROBE_DEFER)

	if (PTR_ERR(priv->clk) == -EPROBE_DEFER)

		return -EPROBE_DEFER;



	priv->rng.name = pdev->name;

drivers/char/hw_random/omap-rng.c

+2 −2
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static int omap_rng_probe(struct platform_device *pdev) 
	}



	priv->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(priv->clk) && PTR_ERR(priv->clk) == -EPROBE_DEFER)

	if (PTR_ERR(priv->clk) == -EPROBE_DEFER)

		return -EPROBE_DEFER;

	if (!IS_ERR(priv->clk)) {

		ret = clk_prepare_enable(priv->clk);
@@ -488,7 +488,7 @@ static int omap_rng_probe(struct platform_device *pdev) 
	}



	priv->clk_reg = devm_clk_get(&pdev->dev, "reg");

	if (IS_ERR(priv->clk_reg) && PTR_ERR(priv->clk_reg) == -EPROBE_DEFER)

	if (PTR_ERR(priv->clk_reg) == -EPROBE_DEFER)

		return -EPROBE_DEFER;

	if (!IS_ERR(priv->clk_reg)) {

		ret = clk_prepare_enable(priv->clk_reg);

drivers/clk/clk.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static void clk_core_fill_parent_index(struct clk_core *core, u8 index) 
			parent = ERR_PTR(-EPROBE_DEFER);

	} else {

		parent = clk_core_get(core, index);

		if (IS_ERR(parent) && PTR_ERR(parent) == -ENOENT && entry->name)

		if (PTR_ERR(parent) == -ENOENT && entry->name)

			parent = clk_core_lookup(entry->name);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE