treewide: remove redundent IS_ERR() before error code check
Subsystems (38)
PATCH 1/1 treewide: remove redundent 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>
---
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(-)
crypto/af_alg.c +1 -1
@@ -169,7 +169,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
@@ -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
@@ -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
@@ -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
@@ -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); }
drivers/dma/mv_xor_v2.c +1 -1
@@ -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; }
drivers/gpio/gpiolib-devres.c +1 -1
@@ -308,7 +308,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;
drivers/gpio/gpiolib-of.c +4 -4
@@ -505,24 +505,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))
drivers/gpio/gpiolib.c +1 -1
@@ -5067,7 +5067,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;
drivers/i2c/busses/i2c-mv64xxx.c +2 -3
@@ -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);
drivers/i2c/busses/i2c-synquacer.c +1 -1
@@ -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);
drivers/mtd/ubi/build.c +1 -1
@@ -1159,7 +1159,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
drivers/of/device.c +1 -1
@@ -161,7 +161,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",
drivers/pci/controller/pci-tegra.c +1 -1
@@ -1406,7 +1406,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;
drivers/phy/phy-core.c +2 -2
@@ -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;
drivers/spi/spi-orion.c +1 -2
@@ -646,8 +646,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; }
drivers/video/fbdev/imxfb.c +1 -1
@@ -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; }
fs/ext4/super.c +1 -1
@@ -5987,7 +5987,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);
fs/f2fs/node.c +1 -1
@@ -875,7 +875,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);
fs/ocfs2/suballoc.c +1 -1
@@ -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);
fs/sysfs/group.c +1 -1
@@ -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);
net/core/dev.c +1 -1
@@ -5723,7 +5723,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buffif (&ptype->list == head) goto normal; -if (IS_ERR (pp) &&PTR_ERR (pp) == -EINPROGRESS ) { +if (PTR_ERR (pp) == -EINPROGRESS ) { ret =GRO_CONSUMED ; goto ok; }
net/core/filter.c +1 -1
@@ -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);
net/xfrm/xfrm_policy.c +1 -1
@@ -3186,7 +3186,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))
sound/soc/codecs/ak4104.c +1 -2
@@ -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
sound/soc/codecs/cs4270.c +1 -2
@@ -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);
sound/soc/codecs/tlv320aic32x4.c +2 -4
@@ -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 ; }
sound/soc/sunxi/sun4i-spdif.c +1 -1
@@ -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;
Signature · 1 line
2.17.1
Quoting Masahiro Yamada (2020-01-05 20:58:33)
Quoted 14 lines
'
PTR_ERR(p)== -E*' is a stronger condition thanIS_ERR(p). Hence,IS_ERR(p)is unneeded.The semantic patch that generates this commit is as follows:
// <smpl>
@@
expression ptr;
constanterror_code;
@@(quoted diff) +1
-1-IS_ERR(ptr) && (PTR_ERR(ptr) == - error_code) +PTR_ERR(ptr) == - error_code// </smpl>
Quoted 2 lines
Signed-off-by Masahiro Yamada <[email protected]>---
For
Quoted 1 line
drivers/clk/clk.c | 2 +-
pon., 6 sty 2020 o 06:00 Masahiro Yamada <[email protected]> napisał(a):
Quoted 15 lines
'
PTR_ERR(p)== -E*' is a stronger condition thanIS_ERR(p). Hence,IS_ERR(p)is unneeded.The semantic patch that generates this commit is as follows:
// <smpl>
@@
expression ptr;
constanterror_code;
@@(quoted diff) +1
-1-IS_ERR(ptr) && (PTR_ERR(ptr) == - error_code) +PTR_ERR(ptr) == - error_code// </smpl>
Quoted 1 line
Signed-off-by Masahiro Yamada <[email protected]>
For GPIO:
Quoted 14 lines · Masahiro Yamada
'
PTR_ERR(p)== -E*' is a stronger condition thanIS_ERR(p). Hence,IS_ERR(p)is unneeded.The semantic patch that generates this commit is as follows:
// <smpl>
@@
expression ptr;
constanterror_code;
@@(quoted diff) +1
-1-IS_ERR(ptr) && (PTR_ERR(ptr) == - error_code) +PTR_ERR(ptr) == - error_code// </smpl>
Quoted 1 line
Signed-off-by Masahiro Yamada <[email protected]>
For drivers/i2c:
Thanks!
Quoted 14 lines · Masahiro Yamada
'
PTR_ERR(p)== -E*' is a stronger condition thanIS_ERR(p). Hence,IS_ERR(p)is unneeded.The semantic patch that generates this commit is as follows:
// <smpl>
@@
expression ptr;
constanterror_code;
@@(quoted diff) +1
-1-IS_ERR(ptr) && (PTR_ERR(ptr) == - error_code) +PTR_ERR(ptr) == - error_code// </smpl>
Quoted 1 line
Signed-off-by Masahiro Yamada <[email protected]>
Any reason for not doing instead:
ptr == ERR_PTR(-error_code)
? To me it seems weird to use PTR_ERR() on non-error pointers. I even had to double check that it returns a 'long' and not an 'int'. (If it returned an 'int', it wouldn't work...)
- Eric
Quoted 16 lines · Eric Biggers
Quoted 14 lines · Masahiro Yamada
'
PTR_ERR(p)== -E*' is a stronger condition thanIS_ERR(p). Hence,IS_ERR(p)is unneeded.The semantic patch that generates this commit is as follows:
// <smpl>
@@
expression ptr;
constanterror_code;
@@(quoted diff) +1
-1-IS_ERR(ptr) && (PTR_ERR(ptr) == - error_code) +PTR_ERR(ptr) == - error_code// </smpl>
Quoted 7 lines
Quoted 1 line
Signed-off-by Masahiro Yamada <[email protected]>Any reason for not doing instead:
ptr == ERR_PTR(-error_code)?
Because there is no reason to change
PTR_ERR(ptr) == -error_code
to
ptr == ERR_PTR(-error_code)
if (PTR_ERR(ptr) == -error_code)style seems to be used more often.
But, I think it is just a matter of preference after all. Both work equally fine.
Quoted 5 lines
To me it seems weird to use
PTR_ERR()on non-error pointers. I even had to
double check that it returns a 'long' and not an 'int'. (If it returned an 'int', it wouldn't work...)- Eric
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 15 lines · Masahiro Yamada
'
PTR_ERR(p)== -E*' is a stronger condition thanIS_ERR(p). Hence,IS_ERR(p)is unneeded.The semantic patch that generates this commit is as follows:
// <smpl>
@@
expression ptr;
constanterror_code;
@@(quoted diff) +1
-1-IS_ERR(ptr) && (PTR_ERR(ptr) == - error_code) +PTR_ERR(ptr) == - error_code// </smpl>
Quoted 2 lines
Signed-off-by Masahiro Yamada <[email protected]>---
for the acpi/scan.c change, but there seems to be a typo in the subject:
s/redundent/redundant/
Quoted 38 lines · Masahiro Yamada
'
PTR_ERR(p)== -E*' is a stronger condition thanIS_ERR(p). Hence,IS_ERR(p)is unneeded.The semantic patch that generates this commit is as follows:
// <smpl>
@@
expression ptr;
constanterror_code;
@@(quoted diff) +1
-1-IS_ERR(ptr) && (PTR_ERR(ptr) == - error_code) +PTR_ERR(ptr) == - error_code// </smpl>
Signed-off-by Masahiro Yamada <[email protected]>---
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 +-
Quoted 9 lines
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(-)