From: Adrian Bunk <bunk@stusta.de>
To: Takashi Iwai <tiwai@suse.de>
Cc: Kailang Yang <kailang@realtek.com.tw>,
Jaroslav Kysela <perex@suse.cz>,
linux-kernel@vger.kernel.org
Subject: [2.6 patch] sound/pci/hda/patch_realtek.c: remove dead code
Date: Sun, 1 Jul 2007 22:21:18 +0200 [thread overview]
Message-ID: <20070701202118.GI10869@stusta.de> (raw)
In-Reply-To: <s5hejk8i6tn.wl%tiwai@suse.de>
On Tue, Jun 19, 2007 at 12:20:36PM +0200, Takashi Iwai wrote:
> At Fri, 15 Jun 2007 23:45:31 +0200,
> Adrian Bunk wrote:
> >
> > This patch removes dead code spotted by the Coverity checker.
> >
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> This appears to be a copy-and-paste error from other
> auto-configuration code. I fixed it on ALSA tree now so that it'll be
> merged to the next mm...
Thanks.
The patch below removes the remaining and really dead code.
> thanks,
>
> Takashi
cu
Adrian
<-- snip -->
This patch removes some dead code spotted by the Coverity checker.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
sound/pci/hda/patch_realtek.c | 2 --
1 file changed, 2 deletions(-)
--- linux-2.6.22-rc6-mm1/sound/pci/hda/patch_realtek.c.old 2007-06-29 22:47:35.000000000 +0200
+++ linux-2.6.22-rc6-mm1/sound/pci/hda/patch_realtek.c 2007-06-29 23:45:48.000000000 +0200
@@ -11170,32 +11170,30 @@ static int alc662_parse_auto_config(stru
err = alc662_auto_create_analog_input_ctls(spec, &spec->autocfg);
if (err < 0)
return err;
spec->multiout.max_channels = spec->multiout.num_dacs * 2;
if (spec->autocfg.dig_out_pin)
spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
if (spec->kctl_alloc)
spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
spec->num_mux_defs = 1;
spec->input_mux = &spec->private_imux;
- if (err < 0)
- return err;
spec->init_verbs[spec->num_init_verbs++] = alc662_auto_init_verbs;
spec->mixers[spec->num_mixers] = alc662_capture_mixer;
spec->num_mixers++;
return 1;
}
/* additional initialization for auto-configuration model */
static void alc662_auto_init(struct hda_codec *codec)
{
alc662_auto_init_multi_out(codec);
alc662_auto_init_hp_out(codec);
alc662_auto_init_analog_input(codec);
}
static int patch_alc662(struct hda_codec *codec)
next prev parent reply other threads:[~2007-07-01 20:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-15 21:45 [RFC: 2.6 patch] sound/pci/hda/patch_realtek.c: remove dead code Adrian Bunk
2007-06-19 10:20 ` Takashi Iwai
2007-07-01 20:21 ` Adrian Bunk [this message]
2007-07-02 14:26 ` [2.6 " Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070701202118.GI10869@stusta.de \
--to=bunk@stusta.de \
--cc=kailang@realtek.com.tw \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@suse.cz \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox