diff for duplicates of <54578CE0.1090201@users.sourceforge.net> diff --git a/a/1.txt b/N1/1.txt index 63b4a75..33a0b1f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,3 +17,10 @@ before. Is this variant acceptable? Regards, Markus +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0001-ALSA-emu10k1-Deletion-of-unnecessary-checks-before-t.patch +Type: text/x-patch +Size: 2120 bytes +Desc: not available +URL: <https://systeme.lip6.fr/pipermail/cocci/attachments/20141103/7a73952b/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index b058e29..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,6 +0,0 @@ -Content-Type: text/x-patch; - name="0001-ALSA-emu10k1-Deletion-of-unnecessary-checks-before-t.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename*0="0001-ALSA-emu10k1-Deletion-of-unnecessary-checks-before-t.pa"; - filename*1="tch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index d17ece0..0000000 --- a/a/2.txt +++ /dev/null @@ -1,61 +0,0 @@ ->From 23bb7bd1325b7c9cc81761db3ebf3ea19f85338d Mon Sep 17 00:00:00 2001 -From: Markus Elfring <elfring@users.sourceforge.net> -Date: Mon, 3 Nov 2014 14:54:36 +0100 -Subject: [PATCH] ALSA: emu10k1: Deletion of unnecessary checks before three - function calls - -The functions kfree(), release_firmware() and snd_util_memhdr_free() test -whether their argument is NULL and then return immediately. Thus the test -around the call is not needed. - -This issue was detected by using the Coccinelle software. - -Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> ---- - sound/pci/emu10k1/emu10k1_main.c | 9 +++------ - sound/pci/emu10k1/emufx.c | 3 +-- - 2 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c -index 2292697..b4458a6 100644 ---- a/sound/pci/emu10k1/emu10k1_main.c -+++ b/sound/pci/emu10k1/emu10k1_main.c -@@ -1289,10 +1289,8 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu) - } - if (emu->emu1010.firmware_thread) - kthread_stop(emu->emu1010.firmware_thread); -- if (emu->firmware) -- release_firmware(emu->firmware); -- if (emu->dock_fw) -- release_firmware(emu->dock_fw); -+ release_firmware(emu->firmware); -+ release_firmware(emu->dock_fw); - if (emu->irq >= 0) - free_irq(emu->irq, emu); - /* remove reserved page */ -@@ -1301,8 +1299,7 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu) - (struct snd_util_memblk *)emu->reserved_page); - emu->reserved_page = NULL; - } -- if (emu->memhdr) -- snd_util_memhdr_free(emu->memhdr); -+ snd_util_memhdr_free(emu->memhdr); - if (emu->silent_page.area) - snd_dma_free_pages(&emu->silent_page); - if (emu->ptb_pages.area) -diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c -index 745f062..eb5c0ab 100644 ---- a/sound/pci/emu10k1/emufx.c -+++ b/sound/pci/emu10k1/emufx.c -@@ -777,8 +777,7 @@ static void snd_emu10k1_ctl_private_free(struct snd_kcontrol *kctl) - kctl->private_value = 0; - list_del(&ctl->list); - kfree(ctl); -- if (kctl->tlv.p) -- kfree(kctl->tlv.p); -+ kfree(kctl->tlv.p); - } - - static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu, --- -2.1.3 diff --git a/a/content_digest b/N1/content_digest index 69ade8a..1bf4ac8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -14,20 +14,14 @@ "ref\0alpine.DEB.2.02.1402252117150.2047@localhost6.localdomain6\0" "ref\0530DD06F.4090703@users.sourceforge.net\0" "ref\0alpine.DEB.2.02.1402262129250.2221@localhost6.localdomain6\0" - "ref\05317A59D.4@users.so urceforge.net\0" + "ref\05317A59D.4@users.sourceforge.net\0" "ref\054567788.9060008@users.sourceforge.net\0" "ref\0s5ha94839dx.wl-tiwai@suse.de\0" - "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" - "Subject\0Re: [PATCH resent] ALSA: emu10k1: Deletion of unnecessary checks before three function calls\0" + "From\0elfring@users.sourceforge.net (SF Markus Elfring)\0" + "Subject\0[Cocci] [PATCH resent] ALSA: emu10k1: Deletion of unnecessary checks before three function calls\0" "Date\0Mon, 03 Nov 2014 15:10:40 +0100\0" - "To\0Takashi Iwai <tiwai@suse.de>\0" - "Cc\0Jaroslav Kysela <perex@perex.cz>" - alsa-devel@alsa-project.org - linux-kernel@vger.kernel.org - kernel-janitors@vger.kernel.org - trivial@kernel.org - " Coccinelle <cocci@systeme.lip6.fr>\0" - "\01:1\0" + "To\0cocci@systeme.lip6.fr\0" + "\00:1\0" "b\0" "> Your patch can't be applied cleanly due to your MUA breaking the\n" "> lines. Please fix your MUA setup, or use an attachment if it's\n" @@ -47,70 +41,13 @@ "before. Is this variant acceptable?\n" "\n" "Regards,\n" - Markus - "\01:2\0" - "fn\00001-ALSA-emu10k1-Deletion-of-unnecessary-checks-before-t.patch\0" - "b\0" - ">From 23bb7bd1325b7c9cc81761db3ebf3ea19f85338d Mon Sep 17 00:00:00 2001\n" - "From: Markus Elfring <elfring@users.sourceforge.net>\n" - "Date: Mon, 3 Nov 2014 14:54:36 +0100\n" - "Subject: [PATCH] ALSA: emu10k1: Deletion of unnecessary checks before three\n" - " function calls\n" - "\n" - "The functions kfree(), release_firmware() and snd_util_memhdr_free() test\n" - "whether their argument is NULL and then return immediately. Thus the test\n" - "around the call is not needed.\n" - "\n" - "This issue was detected by using the Coccinelle software.\n" - "\n" - "Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>\n" - "---\n" - " sound/pci/emu10k1/emu10k1_main.c | 9 +++------\n" - " sound/pci/emu10k1/emufx.c | 3 +--\n" - " 2 files changed, 4 insertions(+), 8 deletions(-)\n" - "\n" - "diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c\n" - "index 2292697..b4458a6 100644\n" - "--- a/sound/pci/emu10k1/emu10k1_main.c\n" - "+++ b/sound/pci/emu10k1/emu10k1_main.c\n" - "@@ -1289,10 +1289,8 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu)\n" - " \t}\n" - " \tif (emu->emu1010.firmware_thread)\n" - " \t\tkthread_stop(emu->emu1010.firmware_thread);\n" - "-\tif (emu->firmware)\n" - "-\t\trelease_firmware(emu->firmware);\n" - "-\tif (emu->dock_fw)\n" - "-\t\trelease_firmware(emu->dock_fw);\n" - "+\trelease_firmware(emu->firmware);\n" - "+\trelease_firmware(emu->dock_fw);\n" - " \tif (emu->irq >= 0)\n" - " \t\tfree_irq(emu->irq, emu);\n" - " \t/* remove reserved page */\n" - "@@ -1301,8 +1299,7 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu)\n" - " \t\t\t(struct snd_util_memblk *)emu->reserved_page);\n" - " \t\temu->reserved_page = NULL;\n" - " \t}\n" - "-\tif (emu->memhdr)\n" - "-\t\tsnd_util_memhdr_free(emu->memhdr);\n" - "+\tsnd_util_memhdr_free(emu->memhdr);\n" - " \tif (emu->silent_page.area)\n" - " \t\tsnd_dma_free_pages(&emu->silent_page);\n" - " \tif (emu->ptb_pages.area)\n" - "diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c\n" - "index 745f062..eb5c0ab 100644\n" - "--- a/sound/pci/emu10k1/emufx.c\n" - "+++ b/sound/pci/emu10k1/emufx.c\n" - "@@ -777,8 +777,7 @@ static void snd_emu10k1_ctl_private_free(struct snd_kcontrol *kctl)\n" - " \tkctl->private_value = 0;\n" - " \tlist_del(&ctl->list);\n" - " \tkfree(ctl);\n" - "-\tif (kctl->tlv.p)\n" - "-\t\tkfree(kctl->tlv.p);\n" - "+\tkfree(kctl->tlv.p);\n" - " }\n" - " \n" - " static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,\n" - "-- \n" - 2.1.3 + "Markus\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0001-ALSA-emu10k1-Deletion-of-unnecessary-checks-before-t.patch\n" + "Type: text/x-patch\n" + "Size: 2120 bytes\n" + "Desc: not available\n" + URL: <https://systeme.lip6.fr/pipermail/cocci/attachments/20141103/7a73952b/attachment.bin> -ebae82ce69aed33c43be5e920bf003b90c8c1fc8859c7a4bd577f384387e6607 +c1c59fe87d71509af95c52aa364375e1d2e7b52019427f0f6e6fa29a917c777d
diff --git a/a/2.txt b/N2/2.txt index d17ece0..3ac612a 100644 --- a/a/2.txt +++ b/N2/2.txt @@ -1,4 +1,4 @@ ->From 23bb7bd1325b7c9cc81761db3ebf3ea19f85338d Mon Sep 17 00:00:00 2001 +From 23bb7bd1325b7c9cc81761db3ebf3ea19f85338d Mon Sep 17 00:00:00 2001 From: Markus Elfring <elfring@users.sourceforge.net> Date: Mon, 3 Nov 2014 14:54:36 +0100 Subject: [PATCH] ALSA: emu10k1: Deletion of unnecessary checks before three diff --git a/a/content_digest b/N2/content_digest index 69ade8a..89405fc 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -19,7 +19,7 @@ "ref\0s5ha94839dx.wl-tiwai@suse.de\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" "Subject\0Re: [PATCH resent] ALSA: emu10k1: Deletion of unnecessary checks before three function calls\0" - "Date\0Mon, 03 Nov 2014 15:10:40 +0100\0" + "Date\0Mon, 03 Nov 2014 14:10:40 +0000\0" "To\0Takashi Iwai <tiwai@suse.de>\0" "Cc\0Jaroslav Kysela <perex@perex.cz>" alsa-devel@alsa-project.org @@ -51,7 +51,7 @@ "\01:2\0" "fn\00001-ALSA-emu10k1-Deletion-of-unnecessary-checks-before-t.patch\0" "b\0" - ">From 23bb7bd1325b7c9cc81761db3ebf3ea19f85338d Mon Sep 17 00:00:00 2001\n" + "From 23bb7bd1325b7c9cc81761db3ebf3ea19f85338d Mon Sep 17 00:00:00 2001\n" "From: Markus Elfring <elfring@users.sourceforge.net>\n" "Date: Mon, 3 Nov 2014 14:54:36 +0100\n" "Subject: [PATCH] ALSA: emu10k1: Deletion of unnecessary checks before three\n" @@ -113,4 +113,4 @@ "-- \n" 2.1.3 -ebae82ce69aed33c43be5e920bf003b90c8c1fc8859c7a4bd577f384387e6607 +3b8cc6f2858854125fc0e75a981ae970b9867df8fc1a1e90e0bf7ca7569cb859
diff --git a/a/content_digest b/N3/content_digest index 69ade8a..e7b7d02 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -14,7 +14,7 @@ "ref\0alpine.DEB.2.02.1402252117150.2047@localhost6.localdomain6\0" "ref\0530DD06F.4090703@users.sourceforge.net\0" "ref\0alpine.DEB.2.02.1402262129250.2221@localhost6.localdomain6\0" - "ref\05317A59D.4@users.so urceforge.net\0" + "ref\05317A59D.4@users.sourceforge.net\0" "ref\054567788.9060008@users.sourceforge.net\0" "ref\0s5ha94839dx.wl-tiwai@suse.de\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" @@ -113,4 +113,4 @@ "-- \n" 2.1.3 -ebae82ce69aed33c43be5e920bf003b90c8c1fc8859c7a4bd577f384387e6607 +94d53dad62793c0c1ef177d821a8777d9a288afc2735aaa476b84b6780db413d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.