Commit 14e5ad7d118997741aa567dfc4398f72762ff08a
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(-)
Showing 3 changed files Side-by-side Diff
sound/soc/intel/atom/sst/sst_loader.c
... | ... | @@ -276,12 +276,10 @@ |
276 | 276 | struct sst_memcpy_list *listnode, *tmplistnode; |
277 | 277 | |
278 | 278 | /* Free the list */ |
279 | - if (!list_empty(&sst_drv_ctx->memcpy_list)) { | |
280 | - list_for_each_entry_safe(listnode, tmplistnode, | |
281 | - &sst_drv_ctx->memcpy_list, memcpylist) { | |
282 | - list_del(&listnode->memcpylist); | |
283 | - kfree(listnode); | |
284 | - } | |
279 | + list_for_each_entry_safe(listnode, tmplistnode, | |
280 | + &sst_drv_ctx->memcpy_list, memcpylist) { | |
281 | + list_del(&listnode->memcpylist); | |
282 | + kfree(listnode); | |
285 | 283 | } |
286 | 284 | } |
287 | 285 |
sound/soc/intel/skylake/skl-pcm.c
... | ... | @@ -1509,11 +1509,9 @@ |
1509 | 1509 | struct skl_dev *skl = bus_to_skl(bus); |
1510 | 1510 | struct skl_module_deferred_bind *modules, *tmp; |
1511 | 1511 | |
1512 | - if (!list_empty(&skl->bind_list)) { | |
1513 | - list_for_each_entry_safe(modules, tmp, &skl->bind_list, node) { | |
1514 | - list_del(&modules->node); | |
1515 | - kfree(modules); | |
1516 | - } | |
1512 | + list_for_each_entry_safe(modules, tmp, &skl->bind_list, node) { | |
1513 | + list_del(&modules->node); | |
1514 | + kfree(modules); | |
1517 | 1515 | } |
1518 | 1516 | |
1519 | 1517 | kfree(skl->dais); |
sound/soc/intel/skylake/skl-topology.c
... | ... | @@ -3773,9 +3773,8 @@ |
3773 | 3773 | struct skl_dev *skl = bus_to_skl(bus); |
3774 | 3774 | struct skl_pipeline *ppl, *tmp; |
3775 | 3775 | |
3776 | - if (!list_empty(&skl->ppl_list)) | |
3777 | - list_for_each_entry_safe(ppl, tmp, &skl->ppl_list, node) | |
3778 | - list_del(&ppl->node); | |
3776 | + list_for_each_entry_safe(ppl, tmp, &skl->ppl_list, node) | |
3777 | + list_del(&ppl->node); | |
3779 | 3778 | |
3780 | 3779 | /* clean up topology */ |
3781 | 3780 | snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL); |