lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] sound: fm801.c fix shadowed variable warning

Browse Source 
id was only used as a counter in a for loop, move the declaration
to where it is used and change it to i.
sound/pci/fm801.c:1288:6: warning: symbol 'id' shadows an earlier one
sound/pci/fm801.c:51:13: originally declared here

[tiwai - fixed a coding style issue as well]

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Harvey Harrison
2008-02-28 11:55:07 +01:00
committed by Takashi Iwai
parent 3463d8fa14
commit 58e4334e82
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/pci/fm801.c
View File

@@ -1285,7 +1285,6 @@ static int wait_for_codec(struct fm801 *chip, unsigned int codec_id,
static int snd_fm801_chip_init(struct fm801 *chip, int resume) static int snd_fm801_chip_init(struct fm801 *chip, int resume)
{ {
int id;
unsigned short cmdw; unsigned short cmdw;
if (chip->tea575x_tuner & 0x0010) if (chip->tea575x_tuner & 0x0010)
@@ -1310,13 +1309,14 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)
} else { } else {
/* my card has the secondary codec */ /* my card has the secondary codec */
/* at address #3, so the loop is inverted */ /* at address #3, so the loop is inverted */
for (id = 3; id > 0; id--) { int i;
if (! wait_for_codec(chip, id, AC97_VENDOR_ID1, for (i = 3; i > 0; i--) {
if (!wait_for_codec(chip, i, AC97_VENDOR_ID1,
msecs_to_jiffies(50))) { msecs_to_jiffies(50))) {
cmdw = inw(FM801_REG(chip, AC97_DATA)); cmdw = inw(FM801_REG(chip, AC97_DATA));
if (cmdw != 0xffff && cmdw != 0) { if (cmdw != 0xffff && cmdw != 0) {
chip->secondary = 1; chip->secondary = 1;
chip->secondary_addr = id; chip->secondary_addr = i;
break; break;
} }
} }