[Sound-open-firmware] [PATCH 0/8] use semicolons rather than commas to separate statements
These patches replace commas by semicolons. This was done using the Coccinelle semantic patch (http://coccinelle.lip6.fr/) shown below.
This semantic patch ensures that commas inside for loop headers will not be transformed. It also doesn't touch macro definitions.
Coccinelle ensures that braces are added as needed when a single-statement branch turns into a multi-statement one.
This semantic patch has a few false positives, for variable delcarations such as:
LIST_HEAD(x), *y;
The semantic patch could be improved to avoid these, but for the moment they have been removed manually (2 occurrences).
// <smpl> @initialize:ocaml@ @@
let infunction p = (* avoid macros *) (List.hd p).current_element <> "something_else"
let combined p1 p2 = (List.hd p1).line_end = (List.hd p2).line || (((List.hd p1).line_end < (List.hd p2).line) && ((List.hd p1).col < (List.hd p2).col))
@bad@ statement S; declaration d; position p; @@
S@p d
// special cases where newlines are needed (hope for no more than 5) @@ expression e1,e2; statement S; position p != bad.p; position p1; position p2 : script:ocaml(p1) { infunction p1 && combined p1 p2 }; @@
- e1@p1,@S@p e2@p2; + e1; e2;
@@ expression e1,e2; statement S; position p != bad.p; position p1; position p2 : script:ocaml(p1) { infunction p1 && combined p1 p2 }; @@
- e1@p1,@S@p e2@p2; + e1; e2;
@@ expression e1,e2; statement S; position p != bad.p; position p1; position p2 : script:ocaml(p1) { infunction p1 && combined p1 p2 }; @@
- e1@p1,@S@p e2@p2; + e1; e2;
@@ expression e1,e2; statement S; position p != bad.p; position p1; position p2 : script:ocaml(p1) { infunction p1 && combined p1 p2 }; @@
- e1@p1,@S@p e2@p2; + e1; e2;
@@ expression e1,e2; statement S; position p != bad.p; position p1; position p2 : script:ocaml(p1) { infunction p1 && combined p1 p2 }; @@
- e1@p1,@S@p e2@p2; + e1; e2;
@r@ expression e1,e2; statement S; position p != bad.p; @@
e1 ,@S@p e2;
@@ expression e1,e2; position p1; position p2 : script:ocaml(p1) { infunction p1 && not(combined p1 p2) }; statement S; position r.p; @@
e1@p1 -,@S@p +; e2@p2 ... when any // </smpl>
---
sound/firewire/fireworks/fireworks_pcm.c | 2 +- sound/pci/hda/patch_ca0132.c | 2 +- sound/pci/hda/patch_hdmi.c | 2 +- sound/soc/codecs/madera.c | 4 ++-- sound/soc/codecs/wm8350.c | 3 ++- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/samsung/snow.c | 2 +- sound/soc/soc-dapm.c | 2 +- sound/soc/sof/intel/hda-dsp.c | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-)
Replace commas with semicolons. What is done is essentially described by the following Coccinelle semantic patch (http://coccinelle.lip6.fr/):
// <smpl> @@ expression e1,e2; @@ e1 -, +; e2 ... when any // </smpl>
Signed-off-by: Julia Lawall Julia.Lawall@inria.fr
--- sound/soc/sof/intel/hda-dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 18ff1c2f5376..2b001151fe37 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -44,7 +44,7 @@ int hda_dsp_core_reset_enter(struct snd_sof_dev *sdev, unsigned int core_mask) reset = HDA_DSP_ADSPCS_CRST_MASK(core_mask); snd_sof_dsp_update_bits_unlocked(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPCS, - reset, reset), + reset, reset);
/* poll with timeout to check if operation successful */ ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR,
On Sun, 11 Oct 2020 11:19:31 +0200, Julia Lawall wrote:
These patches replace commas by semicolons. This was done using the Coccinelle semantic patch (http://coccinelle.lip6.fr/) shown below.
This semantic patch ensures that commas inside for loop headers will not be transformed. It also doesn't touch macro definitions.
Coccinelle ensures that braces are added as needed when a single-statement branch turns into a multi-statement one.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/6] ASoC: wm8350: use semicolons rather than commas to separate statements commit: 2db5fa77cd7ea4bd18c7e1afb49417debc9f498a [2/6] ASoC: Intel: bytcr_rt5651: use semicolons rather than commas to separate statements commit: edc3f5b43a4446c84069e59df7e48663ec28579d [3/6] ASoC: SOF: Intel: hda: use semicolons rather than commas to separate statements commit: bed5ed644c741fd69a19a3cb811b5c1da1d50755 [4/6] ASoC: samsung: snow: use semicolons rather than commas to separate statements commit: 40faaca03bf7d7ca1480677f0c8c543016cf426d [5/6] ASoC: madera: use semicolons rather than commas to separate statements commit: 94fa760d01c21350261388f404e167d5cb752573 [6/6] ASoC: dapm: use semicolons rather than commas to separate statements commit: a1344daeab95b93dd1d19fcfbc7dbaf2a4735129
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
participants (2)
-
Julia Lawall -
Mark Brown