From: Greg Kroah-Hartman Date: Mon, 15 May 2023 13:20:53 +0000 (+0200) Subject: drop queue-5.4/treewide-remove-redundant-is_err-before-error-code-c.patch X-Git-Tag: v4.14.315~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d777c972e801449258bc0afb06de05d6d1b6d674;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.4/treewide-remove-redundant-is_err-before-error-code-c.patch It's not needed for a one character patch :) --- diff --git a/queue-5.4/dmaengine-mv_xor_v2-fix-an-error-code.patch b/queue-5.4/dmaengine-mv_xor_v2-fix-an-error-code.patch index 4cec21c91e2..9fe5f9e1a8e 100644 --- a/queue-5.4/dmaengine-mv_xor_v2-fix-an-error-code.patch +++ b/queue-5.4/dmaengine-mv_xor_v2-fix-an-error-code.patch @@ -15,23 +15,19 @@ Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/201170dff832a3c496d125772e10070cd834ebf2.1679814350.git.christophe.jaillet@wanadoo.fr Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/dma/mv_xor_v2.c | 2 +- + drivers/dma/mv_xor_v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/dma/mv_xor_v2.c b/drivers/dma/mv_xor_v2.c -index 741b7270a9f5f..e27df4fed0368 100644 --- a/drivers/dma/mv_xor_v2.c +++ b/drivers/dma/mv_xor_v2.c -@@ -751,7 +751,7 @@ static int mv_xor_v2_probe(struct platform_device *pdev) +@@ -751,7 +751,7 @@ static int mv_xor_v2_probe(struct platfo xor_dev->clk = devm_clk_get(&pdev->dev, NULL); - if (PTR_ERR(xor_dev->clk) == -EPROBE_DEFER) { + if (IS_ERR(xor_dev->clk) && PTR_ERR(xor_dev->clk) == -EPROBE_DEFER) { - ret = EPROBE_DEFER; + ret = -EPROBE_DEFER; goto disable_reg_clk; } if (!IS_ERR(xor_dev->clk)) { --- -2.39.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 544a4b2a488..b6db023dd74 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -180,7 +180,6 @@ clocksource-drivers-davinci-fix-memory-leak-in-davin.patch openrisc-properly-store-r31-to-pt_regs-on-unhandled-.patch ext4-fix-use-after-free-read-in-ext4_find_extent-for.patch leds-ti_lmu_common-select-regmap-instead-of-dependin.patch -treewide-remove-redundant-is_err-before-error-code-c.patch dmaengine-mv_xor_v2-fix-an-error-code.patch pwm-mtk-disp-don-t-check-the-return-code-of-pwmchip_.patch pwm-mtk-disp-adjust-the-clocks-to-avoid-them-mismatc.patch diff --git a/queue-5.4/treewide-remove-redundant-is_err-before-error-code-c.patch b/queue-5.4/treewide-remove-redundant-is_err-before-error-code-c.patch deleted file mode 100644 index dbbe0e2c9ae..00000000000 --- a/queue-5.4/treewide-remove-redundant-is_err-before-error-code-c.patch +++ /dev/null @@ -1,488 +0,0 @@ -From ad5bc285754907f70d1dd8145caded48cc66441c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 Feb 2020 17:37:45 -0800 -Subject: treewide: remove redundant IS_ERR() before error code check - -From: Masahiro Yamada - -[ Upstream commit 45586c7078d42b932c5399953d21746800083691 ] - -'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: - -// -@@ -expression ptr; -constant error_code; -@@ --IS_ERR(ptr) && (PTR_ERR(ptr) == - error_code) -+PTR_ERR(ptr) == - error_code -// - -Link: http://lkml.kernel.org/r/20200106045833.1725-1-masahiroy@kernel.org -Signed-off-by: Masahiro Yamada -Cc: Julia Lawall -Acked-by: Stephen Boyd [drivers/clk/clk.c] -Acked-by: Bartosz Golaszewski [GPIO] -Acked-by: Wolfram Sang [drivers/i2c] -Acked-by: Rafael J. Wysocki [acpi/scan.c] -Acked-by: Rob Herring -Cc: Eric Biggers -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Stable-dep-of: 827026ae2e56 ("dmaengine: mv_xor_v2: Fix an error code.") -Signed-off-by: Sasha Levin ---- - crypto/af_alg.c | 2 +- - drivers/acpi/scan.c | 2 +- - drivers/char/hw_random/bcm2835-rng.c | 2 +- - drivers/char/hw_random/omap-rng.c | 4 ++-- - drivers/clk/clk.c | 2 +- - drivers/dma/mv_xor_v2.c | 2 +- - drivers/gpio/gpiolib-devres.c | 2 +- - drivers/gpio/gpiolib-of.c | 8 ++++---- - drivers/gpio/gpiolib.c | 2 +- - drivers/i2c/busses/i2c-mv64xxx.c | 5 ++--- - drivers/i2c/busses/i2c-synquacer.c | 2 +- - drivers/mtd/ubi/build.c | 2 +- - drivers/of/device.c | 2 +- - drivers/pci/controller/pci-tegra.c | 2 +- - drivers/phy/phy-core.c | 4 ++-- - drivers/spi/spi-orion.c | 3 +-- - drivers/video/fbdev/imxfb.c | 2 +- - fs/ext4/super.c | 2 +- - fs/f2fs/node.c | 2 +- - fs/ocfs2/suballoc.c | 2 +- - fs/sysfs/group.c | 2 +- - net/core/dev.c | 2 +- - net/core/filter.c | 2 +- - net/xfrm/xfrm_policy.c | 2 +- - sound/soc/codecs/ak4104.c | 3 +-- - sound/soc/codecs/cs4270.c | 3 +-- - sound/soc/codecs/tlv320aic32x4.c | 6 ++---- - sound/soc/sunxi/sun4i-spdif.c | 2 +- - 28 files changed, 35 insertions(+), 41 deletions(-) - -diff --git a/crypto/af_alg.c b/crypto/af_alg.c -index 4a2e91baabdef..bb13acef2cb95 100644 ---- a/crypto/af_alg.c -+++ b/crypto/af_alg.c -@@ -170,7 +170,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) - 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); - } -diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 5d4be80ee6cb4..0c40e1098064a 100644 ---- a/drivers/acpi/scan.c -+++ b/drivers/acpi/scan.c -@@ -1506,7 +1506,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, -diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c -index f759790c3cdb6..b40601b3127e3 100644 ---- a/drivers/char/hw_random/bcm2835-rng.c -+++ b/drivers/char/hw_random/bcm2835-rng.c -@@ -160,7 +160,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; -diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c -index e329f82c0467f..9ad3e12430c3c 100644 ---- a/drivers/char/hw_random/omap-rng.c -+++ b/drivers/char/hw_random/omap-rng.c -@@ -478,7 +478,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); -@@ -490,7 +490,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); -diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index 1c73668b43755..fb7b49521646a 100644 ---- a/drivers/clk/clk.c -+++ b/drivers/clk/clk.c -@@ -444,7 +444,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); - } - -diff --git a/drivers/dma/mv_xor_v2.c b/drivers/dma/mv_xor_v2.c -index 3fa884145eb1e..741b7270a9f5f 100644 ---- a/drivers/dma/mv_xor_v2.c -+++ b/drivers/dma/mv_xor_v2.c -@@ -750,7 +750,7 @@ static int mv_xor_v2_probe(struct platform_device *pdev) - } - - xor_dev->clk = devm_clk_get(&pdev->dev, NULL); -- if (IS_ERR(xor_dev->clk) && PTR_ERR(xor_dev->clk) == -EPROBE_DEFER) { -+ if (PTR_ERR(xor_dev->clk) == -EPROBE_DEFER) { - ret = EPROBE_DEFER; - goto disable_reg_clk; - } -diff --git a/drivers/gpio/gpiolib-devres.c b/drivers/gpio/gpiolib-devres.c -index 98e3c20d9730e..3fc5b86e03faa 100644 ---- a/drivers/gpio/gpiolib-devres.c -+++ b/drivers/gpio/gpiolib-devres.c -@@ -323,7 +323,7 @@ devm_gpiod_get_array_optional(struct device *dev, const char *con_id, - struct gpio_descs *descs; - - descs = devm_gpiod_get_array(dev, con_id, flags); -- if (IS_ERR(descs) && (PTR_ERR(descs) == -ENOENT)) -+ if (PTR_ERR(descs) == -ENOENT) - return NULL; - - return descs; -diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c -index 73807c897391c..34e0c3f106566 100644 ---- a/drivers/gpio/gpiolib-of.c -+++ b/drivers/gpio/gpiolib-of.c -@@ -498,24 +498,24 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, - break; - } - -- if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) { -+ if (PTR_ERR(desc) == -ENOENT) { - /* Special handling for SPI GPIOs if used */ - desc = of_find_spi_gpio(dev, con_id, &of_flags); - } - -- if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) { -+ if (PTR_ERR(desc) == -ENOENT) { - /* This quirk looks up flags and all */ - desc = of_find_spi_cs_gpio(dev, con_id, idx, flags); - if (!IS_ERR(desc)) - return desc; - } - -- if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) { -+ if (PTR_ERR(desc) == -ENOENT) { - /* Special handling for regulator GPIOs if used */ - desc = of_find_regulator_gpio(dev, con_id, &of_flags); - } - -- if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) -+ if (PTR_ERR(desc) == -ENOENT) - desc = of_find_arizona_gpio(dev, con_id, &of_flags); - - if (IS_ERR(desc)) -diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c -index abdf448b11a3d..06aeb75db6c68 100644 ---- a/drivers/gpio/gpiolib.c -+++ b/drivers/gpio/gpiolib.c -@@ -4894,7 +4894,7 @@ struct gpio_descs *__must_check gpiod_get_array_optional(struct device *dev, - struct gpio_descs *descs; - - descs = gpiod_get_array(dev, con_id, flags); -- if (IS_ERR(descs) && (PTR_ERR(descs) == -ENOENT)) -+ if (PTR_ERR(descs) == -ENOENT) - return NULL; - - return descs; -diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c -index a5a95ea5b81a7..febb7c7ea72ba 100644 ---- a/drivers/i2c/busses/i2c-mv64xxx.c -+++ b/drivers/i2c/busses/i2c-mv64xxx.c -@@ -901,14 +901,13 @@ mv64xxx_i2c_probe(struct platform_device *pd) - - /* Not all platforms have clocks */ - drv_data->clk = devm_clk_get(&pd->dev, NULL); -- if (IS_ERR(drv_data->clk) && PTR_ERR(drv_data->clk) == -EPROBE_DEFER) -+ if (PTR_ERR(drv_data->clk) == -EPROBE_DEFER) - return -EPROBE_DEFER; - if (!IS_ERR(drv_data->clk)) - clk_prepare_enable(drv_data->clk); - - drv_data->reg_clk = devm_clk_get(&pd->dev, "reg"); -- if (IS_ERR(drv_data->reg_clk) && -- PTR_ERR(drv_data->reg_clk) == -EPROBE_DEFER) -+ if (PTR_ERR(drv_data->reg_clk) == -EPROBE_DEFER) - return -EPROBE_DEFER; - if (!IS_ERR(drv_data->reg_clk)) - clk_prepare_enable(drv_data->reg_clk); -diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c -index 39762f0611b18..86026798b4f76 100644 ---- a/drivers/i2c/busses/i2c-synquacer.c -+++ b/drivers/i2c/busses/i2c-synquacer.c -@@ -553,7 +553,7 @@ static int synquacer_i2c_probe(struct platform_device *pdev) - &i2c->pclkrate); - - i2c->pclk = devm_clk_get(&pdev->dev, "pclk"); -- if (IS_ERR(i2c->pclk) && PTR_ERR(i2c->pclk) == -EPROBE_DEFER) -+ if (PTR_ERR(i2c->pclk) == -EPROBE_DEFER) - return -EPROBE_DEFER; - if (!IS_ERR_OR_NULL(i2c->pclk)) { - dev_dbg(&pdev->dev, "clock source %p\n", i2c->pclk); -diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c -index f29ed9102ce91..1c036356d6d3f 100644 ---- a/drivers/mtd/ubi/build.c -+++ b/drivers/mtd/ubi/build.c -@@ -1168,7 +1168,7 @@ static struct mtd_info * __init open_mtd_device(const char *mtd_dev) - * MTD device name. - */ - mtd = get_mtd_device_nm(mtd_dev); -- if (IS_ERR(mtd) && PTR_ERR(mtd) == -ENODEV) -+ if (PTR_ERR(mtd) == -ENODEV) - /* Probably this is an MTD character device node path */ - mtd = open_mtd_by_chdev(mtd_dev); - } else -diff --git a/drivers/of/device.c b/drivers/of/device.c -index 7fb870097a849..aba1510f5d039 100644 ---- a/drivers/of/device.c -+++ b/drivers/of/device.c -@@ -160,7 +160,7 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma) - coherent ? " " : " not "); - - iommu = of_iommu_configure(dev, np); -- if (IS_ERR(iommu) && PTR_ERR(iommu) == -EPROBE_DEFER) -+ if (PTR_ERR(iommu) == -EPROBE_DEFER) - return -EPROBE_DEFER; - - dev_dbg(dev, "device is%sbehind an iommu\n", -diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c -index 99d505a85067b..b051130e45414 100644 ---- a/drivers/pci/controller/pci-tegra.c -+++ b/drivers/pci/controller/pci-tegra.c -@@ -1381,7 +1381,7 @@ static struct phy *devm_of_phy_optional_get_index(struct device *dev, - phy = devm_of_phy_get(dev, np, name); - kfree(name); - -- if (IS_ERR(phy) && PTR_ERR(phy) == -ENODEV) -+ if (PTR_ERR(phy) == -ENODEV) - phy = NULL; - - return phy; -diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c -index b04f4fe85ac2d..48d355cf02105 100644 ---- a/drivers/phy/phy-core.c -+++ b/drivers/phy/phy-core.c -@@ -690,7 +690,7 @@ struct phy *phy_optional_get(struct device *dev, const char *string) - { - struct phy *phy = phy_get(dev, string); - -- if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV)) -+ if (PTR_ERR(phy) == -ENODEV) - phy = NULL; - - return phy; -@@ -744,7 +744,7 @@ struct phy *devm_phy_optional_get(struct device *dev, const char *string) - { - struct phy *phy = devm_phy_get(dev, string); - -- if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV)) -+ if (PTR_ERR(phy) == -ENODEV) - phy = NULL; - - return phy; -diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c -index 6643ccdc25085..989aa053471d3 100644 ---- a/drivers/spi/spi-orion.c -+++ b/drivers/spi/spi-orion.c -@@ -648,8 +648,7 @@ static int orion_spi_probe(struct platform_device *pdev) - - /* The following clock is only used by some SoCs */ - spi->axi_clk = devm_clk_get(&pdev->dev, "axi"); -- if (IS_ERR(spi->axi_clk) && -- PTR_ERR(spi->axi_clk) == -EPROBE_DEFER) { -+ if (PTR_ERR(spi->axi_clk) == -EPROBE_DEFER) { - status = -EPROBE_DEFER; - goto out_rel_clk; - } -diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c -index ffde3107104bc..4de59807e0c88 100644 ---- a/drivers/video/fbdev/imxfb.c -+++ b/drivers/video/fbdev/imxfb.c -@@ -1017,7 +1017,7 @@ static int imxfb_probe(struct platform_device *pdev) - } - - fbi->lcd_pwr = devm_regulator_get(&pdev->dev, "lcd"); -- if (IS_ERR(fbi->lcd_pwr) && (PTR_ERR(fbi->lcd_pwr) == -EPROBE_DEFER)) { -+ if (PTR_ERR(fbi->lcd_pwr) == -EPROBE_DEFER) { - ret = -EPROBE_DEFER; - goto failed_lcd; - } -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 789a9f6a2ec6e..8b564e40f736b 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -6172,7 +6172,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type, - bh = ext4_bread(handle, inode, blk, - EXT4_GET_BLOCKS_CREATE | - EXT4_GET_BLOCKS_METADATA_NOFAIL); -- } while (IS_ERR(bh) && (PTR_ERR(bh) == -ENOSPC) && -+ } while (PTR_ERR(bh) == -ENOSPC && - ext4_should_retry_alloc(inode->i_sb, &retries)); - if (IS_ERR(bh)) - return PTR_ERR(bh); -diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c -index b080d5c58f6cb..dde8a99189899 100644 ---- a/fs/f2fs/node.c -+++ b/fs/f2fs/node.c -@@ -879,7 +879,7 @@ static int truncate_dnode(struct dnode_of_data *dn) - - /* get direct node */ - page = f2fs_get_node_page(F2FS_I_SB(dn->inode), dn->nid); -- if (IS_ERR(page) && PTR_ERR(page) == -ENOENT) -+ if (PTR_ERR(page) == -ENOENT) - return 1; - else if (IS_ERR(page)) - return PTR_ERR(page); -diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c -index 5e0eaea474055..9e79fc6308da5 100644 ---- a/fs/ocfs2/suballoc.c -+++ b/fs/ocfs2/suballoc.c -@@ -696,7 +696,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb, - - bg_bh = ocfs2_block_group_alloc_contig(osb, handle, alloc_inode, - ac, cl); -- if (IS_ERR(bg_bh) && (PTR_ERR(bg_bh) == -ENOSPC)) -+ if (PTR_ERR(bg_bh) == -ENOSPC) - bg_bh = ocfs2_block_group_alloc_discontig(handle, - alloc_inode, - ac, cl); -diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c -index d41c21fef1388..c4ab045926b7c 100644 ---- a/fs/sysfs/group.c -+++ b/fs/sysfs/group.c -@@ -449,7 +449,7 @@ int __compat_only_sysfs_link_entry_to_kobj(struct kobject *kobj, - } - - link = kernfs_create_link(kobj->sd, target_name, entry); -- if (IS_ERR(link) && PTR_ERR(link) == -EEXIST) -+ if (PTR_ERR(link) == -EEXIST) - sysfs_warn_dup(kobj->sd, target_name); - - kernfs_put(entry); -diff --git a/net/core/dev.c b/net/core/dev.c -index 1a4e20c4ba053..ddc6ae844c0a8 100644 ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -5552,7 +5552,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff - if (&ptype->list == head) - goto normal; - -- if (IS_ERR(pp) && PTR_ERR(pp) == -EINPROGRESS) { -+ if (PTR_ERR(pp) == -EINPROGRESS) { - ret = GRO_CONSUMED; - goto ok; - } -diff --git a/net/core/filter.c b/net/core/filter.c -index d866e1c5970cc..135e65754d8d8 100644 ---- a/net/core/filter.c -+++ b/net/core/filter.c -@@ -1573,7 +1573,7 @@ int sk_reuseport_attach_bpf(u32 ufd, struct sock *sk) - return -EPERM; - - prog = bpf_prog_get_type(ufd, BPF_PROG_TYPE_SOCKET_FILTER); -- if (IS_ERR(prog) && PTR_ERR(prog) == -EINVAL) -+ if (PTR_ERR(prog) == -EINVAL) - prog = bpf_prog_get_type(ufd, BPF_PROG_TYPE_SK_REUSEPORT); - if (IS_ERR(prog)) - return PTR_ERR(prog); -diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c -index 6f58be5a17711..5f8f3d880e3d5 100644 ---- a/net/xfrm/xfrm_policy.c -+++ b/net/xfrm/xfrm_policy.c -@@ -3191,7 +3191,7 @@ struct dst_entry *xfrm_lookup_route(struct net *net, struct dst_entry *dst_orig, - flags | XFRM_LOOKUP_QUEUE | - XFRM_LOOKUP_KEEP_DST_REF); - -- if (IS_ERR(dst) && PTR_ERR(dst) == -EREMOTE) -+ if (PTR_ERR(dst) == -EREMOTE) - return make_blackhole(net, dst_orig->ops->family, dst_orig); - - if (IS_ERR(dst)) -diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c -index e8c5fda82e085..979cfb165eed4 100644 ---- a/sound/soc/codecs/ak4104.c -+++ b/sound/soc/codecs/ak4104.c -@@ -295,8 +295,7 @@ static int ak4104_spi_probe(struct spi_device *spi) - - reset_gpiod = devm_gpiod_get_optional(&spi->dev, "reset", - GPIOD_OUT_HIGH); -- if (IS_ERR(reset_gpiod) && -- PTR_ERR(reset_gpiod) == -EPROBE_DEFER) -+ if (PTR_ERR(reset_gpiod) == -EPROBE_DEFER) - return -EPROBE_DEFER; - - /* read the 'reserved' register - according to the datasheet, it -diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c -index 793a14d586672..5f25b9f872bdf 100644 ---- a/sound/soc/codecs/cs4270.c -+++ b/sound/soc/codecs/cs4270.c -@@ -681,8 +681,7 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, - - reset_gpiod = devm_gpiod_get_optional(&i2c_client->dev, "reset", - GPIOD_OUT_HIGH); -- if (IS_ERR(reset_gpiod) && -- PTR_ERR(reset_gpiod) == -EPROBE_DEFER) -+ if (PTR_ERR(reset_gpiod) == -EPROBE_DEFER) - return -EPROBE_DEFER; - - cs4270->regmap = devm_regmap_init_i2c(i2c_client, &cs4270_regmap); -diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c -index 7a1ffbaf48be5..f2948fe3f590e 100644 ---- a/sound/soc/codecs/tlv320aic32x4.c -+++ b/sound/soc/codecs/tlv320aic32x4.c -@@ -1098,11 +1098,9 @@ static int aic32x4_setup_regulators(struct device *dev, - return PTR_ERR(aic32x4->supply_av); - } - } else { -- if (IS_ERR(aic32x4->supply_dv) && -- PTR_ERR(aic32x4->supply_dv) == -EPROBE_DEFER) -+ if (PTR_ERR(aic32x4->supply_dv) == -EPROBE_DEFER) - return -EPROBE_DEFER; -- if (IS_ERR(aic32x4->supply_av) && -- PTR_ERR(aic32x4->supply_av) == -EPROBE_DEFER) -+ if (PTR_ERR(aic32x4->supply_av) == -EPROBE_DEFER) - return -EPROBE_DEFER; - } - -diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c -index cbe598b0fb107..98a9fe6455213 100644 ---- a/sound/soc/sunxi/sun4i-spdif.c -+++ b/sound/soc/sunxi/sun4i-spdif.c -@@ -555,7 +555,7 @@ static int sun4i_spdif_probe(struct platform_device *pdev) - if (quirks->has_reset) { - host->rst = devm_reset_control_get_optional_exclusive(&pdev->dev, - NULL); -- if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) { -+ if (PTR_ERR(host->rst) == -EPROBE_DEFER) { - ret = -EPROBE_DEFER; - dev_err(&pdev->dev, "Failed to get reset: %d\n", ret); - return ret; --- -2.39.2 -