Commit 14e5ad7d authored by Mark Brown's avatar Mark Brown

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(-)
parents d0508b4f a383308e
...@@ -276,13 +276,11 @@ void sst_memcpy_free_resources(struct intel_sst_drv *sst_drv_ctx) ...@@ -276,13 +276,11 @@ void sst_memcpy_free_resources(struct intel_sst_drv *sst_drv_ctx)
struct sst_memcpy_list *listnode, *tmplistnode; struct sst_memcpy_list *listnode, *tmplistnode;
/* Free the list */ /* Free the list */
if (!list_empty(&sst_drv_ctx->memcpy_list)) {
list_for_each_entry_safe(listnode, tmplistnode, list_for_each_entry_safe(listnode, tmplistnode,
&sst_drv_ctx->memcpy_list, memcpylist) { &sst_drv_ctx->memcpy_list, memcpylist) {
list_del(&listnode->memcpylist); list_del(&listnode->memcpylist);
kfree(listnode); kfree(listnode);
} }
}
} }
static int sst_cache_and_parse_fw(struct intel_sst_drv *sst, static int sst_cache_and_parse_fw(struct intel_sst_drv *sst,
......
...@@ -1509,12 +1509,10 @@ int skl_platform_unregister(struct device *dev) ...@@ -1509,12 +1509,10 @@ int skl_platform_unregister(struct device *dev)
struct skl_dev *skl = bus_to_skl(bus); struct skl_dev *skl = bus_to_skl(bus);
struct skl_module_deferred_bind *modules, *tmp; 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_for_each_entry_safe(modules, tmp, &skl->bind_list, node) {
list_del(&modules->node); list_del(&modules->node);
kfree(modules); kfree(modules);
} }
}
kfree(skl->dais); kfree(skl->dais);
......
...@@ -3773,7 +3773,6 @@ void skl_tplg_exit(struct snd_soc_component *component, struct hdac_bus *bus) ...@@ -3773,7 +3773,6 @@ void skl_tplg_exit(struct snd_soc_component *component, struct hdac_bus *bus)
struct skl_dev *skl = bus_to_skl(bus); struct skl_dev *skl = bus_to_skl(bus);
struct skl_pipeline *ppl, *tmp; struct skl_pipeline *ppl, *tmp;
if (!list_empty(&skl->ppl_list))
list_for_each_entry_safe(ppl, tmp, &skl->ppl_list, node) list_for_each_entry_safe(ppl, tmp, &skl->ppl_list, node)
list_del(&ppl->node); list_del(&ppl->node);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment