diff options
author | Mark Brown <broonie@kernel.org> | 2020-07-31 00:54:40 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-07-31 00:54:40 +0300 |
commit | 14e5ad7d118997741aa567dfc4398f72762ff08a (patch) | |
tree | 262489398e2d640f665b1760a0922382bc305b2e /sound | |
parent | d0508b4f16049a658d68a7c276ba08296c5a76bc (diff) | |
parent | a383308e50244a28fe927b9c1acbe0a963bf186b (diff) | |
download | linux-14e5ad7d118997741aa567dfc4398f72762ff08a.tar.xz |
Merge series "drop unnecessary list_empty" from Julia Lawall <Julia.Lawall@inria.fr>:
The various list iterators are able to handle an empty list.
The only effect of avoiding the loop is not initializing some
index variables.
Drop list_empty tests in cases where these variables are not
used.
The semantic patch that makes these changes is as follows:
(http://coccinelle.lip6.fr/)
<smpl>
@@
expression x,e;
iterator name list_for_each_entry;
statement S;
identifier i;
@@
-if (!(list_empty(x))) {
list_for_each_entry(i,x,...) S
- }
... when != i
? i = e
@@
expression x,e;
iterator name list_for_each_entry_safe;
statement S;
identifier i,j;
@@
-if (!(list_empty(x))) {
list_for_each_entry_safe(i,j,x,...) S
- }
... when != i
when != j
(
i = e;
|
? j = e;
)
@@
expression x,e;
iterator name list_for_each;
statement S;
identifier i;
@@
-if (!(list_empty(x))) {
list_for_each(i,x) S
- }
... when != i
? i = e
@@
expression x,e;
iterator name list_for_each_safe;
statement S;
identifier i,j;
@@
-if (!(list_empty(x))) {
list_for_each_safe(i,j,x) S
- }
... when != i
when != j
(
i = e;
|
? j = e;
)
// -------------------
@@
expression x,e;
statement S;
identifier i;
@@
-if (!(list_empty(x)))
list_for_each_entry(i,x,...) S
... when != i
? i = e
@@
expression x,e;
statement S;
identifier i,j;
@@
-if (!(list_empty(x)))
list_for_each_entry_safe(i,j,x,...) S
... when != i
when != j
(
i = e;
|
? j = e;
)
@@
expression x,e;
statement S;
identifier i;
@@
-if (!(list_empty(x)))
list_for_each(i,x) S
... when != i
? i = e
@@
expression x,e;
statement S;
identifier i,j;
@@
-if (!(list_empty(x)))
list_for_each_safe(i,j,x) S
... when != i
when != j
(
i = e;
|
? j = e;
)
</smpl>
---
drivers/media/pci/saa7134/saa7134-core.c | 14 ++---
drivers/media/usb/cx231xx/cx231xx-core.c | 16 ++----
drivers/media/usb/tm6000/tm6000-core.c | 24 +++-------
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c | 13 ++---
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c | 5 --
drivers/net/ethernet/sfc/ptp.c | 20 +++-----
drivers/net/wireless/ath/dfs_pattern_detector.c | 15 ++----
sound/soc/intel/atom/sst/sst_loader.c | 10 +---
sound/soc/intel/skylake/skl-pcm.c | 8 +--
sound/soc/intel/skylake/skl-topology.c | 5 --
10 files changed, 53 insertions(+), 77 deletions(-)
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/intel/atom/sst/sst_loader.c | 10 | ||||
-rw-r--r-- | sound/soc/intel/skylake/skl-pcm.c | 8 | ||||
-rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 5 |
3 files changed, 9 insertions, 14 deletions
diff --git a/sound/soc/intel/atom/sst/sst_loader.c b/sound/soc/intel/atom/sst/sst_loader.c index 8ad0ca70ec62..fc91a304256b 100644 --- a/sound/soc/intel/atom/sst/sst_loader.c +++ b/sound/soc/intel/atom/sst/sst_loader.c @@ -276,12 +276,10 @@ void sst_memcpy_free_resources(struct intel_sst_drv *sst_drv_ctx) struct sst_memcpy_list *listnode, *tmplistnode; /* Free the list */ - if (!list_empty(&sst_drv_ctx->memcpy_list)) { - list_for_each_entry_safe(listnode, tmplistnode, - &sst_drv_ctx->memcpy_list, memcpylist) { - list_del(&listnode->memcpylist); - kfree(listnode); - } + list_for_each_entry_safe(listnode, tmplistnode, + &sst_drv_ctx->memcpy_list, memcpylist) { + list_del(&listnode->memcpylist); + kfree(listnode); } } diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 268ba1662f69..5dee55e9546b 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -1509,11 +1509,9 @@ int skl_platform_unregister(struct device *dev) struct skl_dev *skl = bus_to_skl(bus); struct skl_module_deferred_bind *modules, *tmp; - if (!list_empty(&skl->bind_list)) { - list_for_each_entry_safe(modules, tmp, &skl->bind_list, node) { - list_del(&modules->node); - kfree(modules); - } + list_for_each_entry_safe(modules, tmp, &skl->bind_list, node) { + list_del(&modules->node); + kfree(modules); } kfree(skl->dais); diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index b9aab47d1202..b7d2d97d12a7 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3773,9 +3773,8 @@ void skl_tplg_exit(struct snd_soc_component *component, struct hdac_bus *bus) struct skl_dev *skl = bus_to_skl(bus); struct skl_pipeline *ppl, *tmp; - if (!list_empty(&skl->ppl_list)) - list_for_each_entry_safe(ppl, tmp, &skl->ppl_list, node) - list_del(&ppl->node); + list_for_each_entry_safe(ppl, tmp, &skl->ppl_list, node) + list_del(&ppl->node); /* clean up topology */ snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL); |