| Message ID | 1401382705.25908.9.camel@x220 (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 66470c973c1b000a9830a58f89741704a9136daa |
| Headers | show |
At Thu, 29 May 2014 18:58:25 +0200, Paul Bolle wrote: > > Checks for CONFIG_SND_DEBUG_ROM were added in v2.5.5 but a Kconfig > symbol SND_DEBUG_ROM was never added. These checks have always > evaluated to false. Remove them and the printk()s they hide. > > Signed-off-by: Paul Bolle <pebolle@tiscali.nl> > --- > Untested. > > Perhaps one is expected to define this debugging macro by hand, somehow. > In that case it would be nice to drop the CONFIG_ prefix. Yeah, but I guess a developer can add such printk anyway easily, so let's clean up the code at first. So, I took your patch now as is. thanks, Takashi > > sound/isa/gus/interwave.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c > index 5abbbe477d16..ad55e5cb8e94 100644 > --- a/sound/isa/gus/interwave.c > +++ b/sound/isa/gus/interwave.c > @@ -442,17 +442,11 @@ static void snd_interwave_detect_memory(struct snd_gus_card *gus) > for (bank_pos = 0; bank_pos < 16L * 1024L * 1024L; bank_pos += 4L * 1024L * 1024L) { > for (i = 0; i < 8; ++i) > iwave[i] = snd_gf1_peek(gus, bank_pos + i); > -#ifdef CONFIG_SND_DEBUG_ROM > - printk(KERN_DEBUG "ROM at 0x%06x = %8phC\n", bank_pos, iwave); > -#endif > if (strncmp(iwave, "INTRWAVE", 8)) > continue; /* first check */ > csum = 0; > for (i = 0; i < sizeof(struct rom_hdr); i++) > csum += snd_gf1_peek(gus, bank_pos + i); > -#ifdef CONFIG_SND_DEBUG_ROM > - printk(KERN_DEBUG "ROM checksum = 0x%x (computed)\n", csum); > -#endif > if (csum != 0) > continue; /* not valid rom */ > gus->gf1.rom_banks++; > -- > 1.9.3 >
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index 5abbbe477d16..ad55e5cb8e94 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c @@ -442,17 +442,11 @@ static void snd_interwave_detect_memory(struct snd_gus_card *gus) for (bank_pos = 0; bank_pos < 16L * 1024L * 1024L; bank_pos += 4L * 1024L * 1024L) { for (i = 0; i < 8; ++i) iwave[i] = snd_gf1_peek(gus, bank_pos + i); -#ifdef CONFIG_SND_DEBUG_ROM - printk(KERN_DEBUG "ROM at 0x%06x = %8phC\n", bank_pos, iwave); -#endif if (strncmp(iwave, "INTRWAVE", 8)) continue; /* first check */ csum = 0; for (i = 0; i < sizeof(struct rom_hdr); i++) csum += snd_gf1_peek(gus, bank_pos + i); -#ifdef CONFIG_SND_DEBUG_ROM - printk(KERN_DEBUG "ROM checksum = 0x%x (computed)\n", csum); -#endif if (csum != 0) continue; /* not valid rom */ gus->gf1.rom_banks++;
Checks for CONFIG_SND_DEBUG_ROM were added in v2.5.5 but a Kconfig symbol SND_DEBUG_ROM was never added. These checks have always evaluated to false. Remove them and the printk()s they hide. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- Untested. Perhaps one is expected to define this debugging macro by hand, somehow. In that case it would be nice to drop the CONFIG_ prefix. sound/isa/gus/interwave.c | 6 ------ 1 file changed, 6 deletions(-)