diff for duplicates of <5da69abe-0bcd-e2c3-cb11-04b44b4f8bd2@users.sourceforge.net> diff --git a/a/1.txt b/N1/1.txt index 3313d90..44e00e9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -62,7 +62,7 @@ index 655fbea1692c..520478a6e605 100644 return err; } #ifdef CONFIG_SND_CS46XX_NEW_DSP - if (chip->nr_ac97_codecs ==2) { + if (chip->nr_ac97_codecs =2) { - if ((err = snd_cs46xx_pcm_center_lfe(chip, 3)) < 0) { + err = snd_cs46xx_pcm_center_lfe(chip, 3); + if (err < 0) { @@ -104,7 +104,7 @@ index 0020fd0efc46..164f86949b2d 100644 - - if ( (cpcm->pcm_channel = cs46xx_dsp_create_pcm_channel (chip, sample_rate, cpcm, - cpcm->hw_buf.addr, -- cpcm->pcm_channel_id)) == NULL) { +- cpcm->pcm_channel_id)) = NULL) { + cpcm + ->pcm_channel = cs46xx_dsp_create_pcm_channel(chip, + sample_rate, @@ -196,9 +196,9 @@ index 0020fd0efc46..164f86949b2d 100644 /* test if we can write to the record gain volume register */ snd_ac97_write(ac97, AC97_REC_GAIN, 0x8a05); -- if ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) == 0x8a05) +- if ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) = 0x8a05) + err = snd_ac97_read(ac97, AC97_REC_GAIN); -+ if (err == 0x8a05) ++ if (err = 0x8a05) return; msleep(10); @@ -214,7 +214,7 @@ index 0020fd0efc46..164f86949b2d 100644 @@ -2515,7 +2531,9 @@ int snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device) kctl = snd_ctl_new1(&snd_cs46xx_controls[idx], chip); - if (kctl && kctl->id.iface == SNDRV_CTL_ELEM_IFACE_PCM) + if (kctl && kctl->id.iface = SNDRV_CTL_ELEM_IFACE_PCM) kctl->id.device = spdif_device; - if ((err = snd_ctl_add(card, kctl)) < 0) + @@ -223,8 +223,7 @@ index 0020fd0efc46..164f86949b2d 100644 return err; } -@@ -2700,9 +2718,9 @@ static const struct snd_rawmidi_ops snd_cs46xx_midi_input = - int snd_cs46xx_midi(struct snd_cs46xx *chip, int device) +@@ -2700,9 +2718,9 @@ static const struct snd_rawmidi_ops snd_cs46xx_midi_input int snd_cs46xx_midi(struct snd_cs46xx *chip, int device) { struct snd_rawmidi *rmidi; - int err; @@ -260,7 +259,7 @@ index 0020fd0efc46..164f86949b2d 100644 for (idx = 0; idx < 5; idx++) { region = &chip->region.idx[idx]; - if ((region->resource = request_mem_region(region->base, region->size, -- region->name)) == NULL) { +- region->name)) = NULL) { + region->resource = request_mem_region(region->base, + region->size, + region->name); @@ -374,7 +373,7 @@ index 7488e1b7a770..f9564f42eb09 100644 @@ -256,9 +256,10 @@ void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip, /* register to proc */ if (ins->snd_card != NULL && ins->proc_dsp_dir != NULL && - scb->proc_info == NULL) { + scb->proc_info = NULL) { - - if ((entry = snd_info_create_card_entry(ins->snd_card, scb->scb_name, - ins->proc_dsp_dir)) != NULL) { diff --git a/a/content_digest b/N1/content_digest index cc4e183..b696a20 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0893b1dc2-d078-9ea6-4ad2-0e0327affddd@users.sourceforge.net\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" "Subject\0[PATCH 1/4] ALSA: cs46xx: Adjust 33 function calls together with a variable assignment\0" - "Date\0Mon, 13 Nov 2017 19:22:30 +0100\0" + "Date\0Mon, 13 Nov 2017 18:22:30 +0000\0" "To\0alsa-devel@alsa-project.org" Bhumika Goyal <bhumirks@gmail.com> Dan Carpenter <dan.carpenter@oracle.com> @@ -77,7 +77,7 @@ " \t\treturn err;\n" " \t}\n" " #ifdef CONFIG_SND_CS46XX_NEW_DSP\n" - " \tif (chip->nr_ac97_codecs ==2) {\n" + " \tif (chip->nr_ac97_codecs =2) {\n" "-\t\tif ((err = snd_cs46xx_pcm_center_lfe(chip, 3)) < 0) {\n" "+\t\terr = snd_cs46xx_pcm_center_lfe(chip, 3);\n" "+\t\tif (err < 0) {\n" @@ -119,7 +119,7 @@ "-\n" "-\t\tif ( (cpcm->pcm_channel = cs46xx_dsp_create_pcm_channel (chip, sample_rate, cpcm, \n" "-\t\t\t\t\t\t\t\t\t cpcm->hw_buf.addr,\n" - "-\t\t\t\t\t\t\t\t\t cpcm->pcm_channel_id)) == NULL) {\n" + "-\t\t\t\t\t\t\t\t\t cpcm->pcm_channel_id)) = NULL) {\n" "+\t\tcpcm\n" "+\t\t->pcm_channel = cs46xx_dsp_create_pcm_channel(chip,\n" "+\t\t\t\t\t\t\t sample_rate,\n" @@ -211,9 +211,9 @@ " \n" " \t\t/* test if we can write to the record gain volume register */\n" " \t\tsnd_ac97_write(ac97, AC97_REC_GAIN, 0x8a05);\n" - "-\t\tif ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) == 0x8a05)\n" + "-\t\tif ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) = 0x8a05)\n" "+\t\terr = snd_ac97_read(ac97, AC97_REC_GAIN);\n" - "+\t\tif (err == 0x8a05)\n" + "+\t\tif (err = 0x8a05)\n" " \t\t\treturn;\n" " \n" " \t\tmsleep(10);\n" @@ -229,7 +229,7 @@ " \n" "@@ -2515,7 +2531,9 @@ int snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)\n" " \t\tkctl = snd_ctl_new1(&snd_cs46xx_controls[idx], chip);\n" - " \t\tif (kctl && kctl->id.iface == SNDRV_CTL_ELEM_IFACE_PCM)\n" + " \t\tif (kctl && kctl->id.iface = SNDRV_CTL_ELEM_IFACE_PCM)\n" " \t\t\tkctl->id.device = spdif_device;\n" "-\t\tif ((err = snd_ctl_add(card, kctl)) < 0)\n" "+\n" @@ -238,8 +238,7 @@ " \t\t\treturn err;\n" " \t}\n" " \n" - "@@ -2700,9 +2718,9 @@ static const struct snd_rawmidi_ops snd_cs46xx_midi_input =\n" - " int snd_cs46xx_midi(struct snd_cs46xx *chip, int device)\n" + "@@ -2700,9 +2718,9 @@ static const struct snd_rawmidi_ops snd_cs46xx_midi_input int snd_cs46xx_midi(struct snd_cs46xx *chip, int device)\n" " {\n" " \tstruct snd_rawmidi *rmidi;\n" "-\tint err;\n" @@ -275,7 +274,7 @@ " \tfor (idx = 0; idx < 5; idx++) {\n" " \t\tregion = &chip->region.idx[idx];\n" "-\t\tif ((region->resource = request_mem_region(region->base, region->size,\n" - "-\t\t\t\t\t\t\t region->name)) == NULL) {\n" + "-\t\t\t\t\t\t\t region->name)) = NULL) {\n" "+\t\tregion->resource = request_mem_region(region->base,\n" "+\t\t\t\t\t\t region->size,\n" "+\t\t\t\t\t\t region->name);\n" @@ -389,7 +388,7 @@ "@@ -256,9 +256,10 @@ void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,\n" " \t/* register to proc */\n" " \tif (ins->snd_card != NULL && ins->proc_dsp_dir != NULL &&\n" - " \t scb->proc_info == NULL) {\n" + " \t scb->proc_info = NULL) {\n" "- \n" "-\t\tif ((entry = snd_info_create_card_entry(ins->snd_card, scb->scb_name, \n" "-\t\t\t\t\t\t\tins->proc_dsp_dir)) != NULL) {\n" @@ -403,4 +402,4 @@ "-- \n" 2.15.0 -7dc95ba835f96d3402c8b7cc1035a915db07af4376815e83ba28301bd726fb8b +f3ba2f5827ab1589b645b45ee7a6123e72388463a89fd6d0e0ea582c05181e40
diff --git a/a/content_digest b/N2/content_digest index cc4e183..96f248c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -9,8 +9,8 @@ Jaroslav Kysela <perex@perex.cz> Takashi Iwai <tiwai@suse.com> " Takashi Sakamoto <o-takashi@sakamocchi.jp>\0" - "Cc\0kernel-janitors@vger.kernel.org" - " LKML <linux-kernel@vger.kernel.org>\0" + "Cc\0LKML <linux-kernel@vger.kernel.org>" + " kernel-janitors@vger.kernel.org\0" "\00:1\0" "b\0" "From: Markus Elfring <elfring@users.sourceforge.net>\n" @@ -403,4 +403,4 @@ "-- \n" 2.15.0 -7dc95ba835f96d3402c8b7cc1035a915db07af4376815e83ba28301bd726fb8b +b5885b1b2ff5b9f9dcbbd07a421444b41ee5dffe5e4ed51077d325a4dc2d268e
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.