| Message ID | 1415891657-7244-2-git-send-email-sudipm.mukherjee@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
At Thu, 13 Nov 2014 20:44:17 +0530, Sudip Mukherjee wrote: > > these variable were initialized with some value, but never used. > and so they are safe to be deleted. > > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> > --- > > i have not given Jaroslav Kysela <perex@perex.cz> in the To list, > as in my last mail, all mails bounced with the error: > "cant create user output file" > > sound/pci/ice1712/ice1712.c | 3 +-- > sound/pci/ice1712/revo.c | 9 +++------ > 2 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c > index b97a0f9..8f27357 100644 > --- a/sound/pci/ice1712/ice1712.c > +++ b/sound/pci/ice1712/ice1712.c > @@ -620,10 +620,9 @@ static int snd_ice1712_playback_ds_prepare(struct snd_pcm_substream *substream) > { > struct snd_ice1712 *ice = snd_pcm_substream_chip(substream); > struct snd_pcm_runtime *runtime = substream->runtime; > - u32 period_size, buf_size, rate, tmp, chn; > + u32 period_size, rate, tmp, chn; > > period_size = snd_pcm_lib_period_bytes(substream) - 1; > - buf_size = snd_pcm_lib_buffer_bytes(substream) - 1; > tmp = 0x0064; > if (snd_pcm_format_width(runtime->format) == 16) > tmp &= ~0x04; > diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c > index 1112ec1..1f40dab 100644 > --- a/sound/pci/ice1712/revo.c > +++ b/sound/pci/ice1712/revo.c > @@ -481,7 +481,6 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice) > static const unsigned char ak4114_init_txcsb[] = { > 0x41, 0x02, 0x2c, 0x00, 0x00 > }; > - int err; > > struct revo51_spec *spec; > spec = kzalloc(sizeof(*spec), GFP_KERNEL); > @@ -489,11 +488,9 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice) > return -ENOMEM; > ice->spec = spec; > > - err = snd_ak4114_create(ice->card, > - ap192_ak4114_read, > - ap192_ak4114_write, > - ak4114_init_vals, ak4114_init_txcsb, > - ice, &spec->ak4114); > + snd_ak4114_create(ice->card, ap192_ak4114_read, ap192_ak4114_write, > + ak4114_init_vals, ak4114_init_txcsb, ice, > + &spec->ak4114); IMO, this is rather a bug. It should return the error (with a proper error handling). thanks, Takashi > /* AK4114 in Revo cannot detect external rate correctly. > * No reason to stop capture stream due to incorrect checks */ > spec->ak4114->check_flags = AK4114_CHECK_NO_RATE; > -- > 1.8.1.2 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >
On Thu, Nov 13, 2014 at 04:22:45PM +0100, Takashi Iwai wrote: > At Thu, 13 Nov 2014 20:44:17 +0530, > Sudip Mukherjee wrote: > > <snip> > > if (snd_pcm_format_width(runtime->format) == 16) > > tmp &= ~0x04; > > diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c > > index 1112ec1..1f40dab 100644 > > --- a/sound/pci/ice1712/revo.c > > +++ b/sound/pci/ice1712/revo.c > > @@ -481,7 +481,6 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice) > > static const unsigned char ak4114_init_txcsb[] = { > > 0x41, 0x02, 0x2c, 0x00, 0x00 > > }; > > - int err; > > > > struct revo51_spec *spec; > > spec = kzalloc(sizeof(*spec), GFP_KERNEL); > > @@ -489,11 +488,9 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice) > > return -ENOMEM; > > ice->spec = spec; > > > > - err = snd_ak4114_create(ice->card, > > - ap192_ak4114_read, > > - ap192_ak4114_write, > > - ak4114_init_vals, ak4114_init_txcsb, > > - ice, &spec->ak4114); > > + snd_ak4114_create(ice->card, ap192_ak4114_read, ap192_ak4114_write, > > + ak4114_init_vals, ak4114_init_txcsb, ice, > > + &spec->ak4114); > > IMO, this is rather a bug. It should return the error (with a proper > error handling). > error handling is already there. ap192_ak4114_init is being called by revo_init, where the return value is being checked. revo_init is the callback function of chip_init, so if we return the error value here then chip_init will fail. but since the author commented "error ignored; it's no fatal error", so i also thought of ignoring the error. I will send you a revised patch. thanks sudip > > thanks, > > Takashi > > > > /* AK4114 in Revo cannot detect external rate correctly. > > * No reason to stop capture stream due to incorrect checks */ > > spec->ak4114->check_flags = AK4114_CHECK_NO_RATE; > > -- > > 1.8.1.2 > > > > _______________________________________________ > > Alsa-devel mailing list > > Alsa-devel@alsa-project.org > > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > >
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index b97a0f9..8f27357 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -620,10 +620,9 @@ static int snd_ice1712_playback_ds_prepare(struct snd_pcm_substream *substream) { struct snd_ice1712 *ice = snd_pcm_substream_chip(substream); struct snd_pcm_runtime *runtime = substream->runtime; - u32 period_size, buf_size, rate, tmp, chn; + u32 period_size, rate, tmp, chn; period_size = snd_pcm_lib_period_bytes(substream) - 1; - buf_size = snd_pcm_lib_buffer_bytes(substream) - 1; tmp = 0x0064; if (snd_pcm_format_width(runtime->format) == 16) tmp &= ~0x04; diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c index 1112ec1..1f40dab 100644 --- a/sound/pci/ice1712/revo.c +++ b/sound/pci/ice1712/revo.c @@ -481,7 +481,6 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice) static const unsigned char ak4114_init_txcsb[] = { 0x41, 0x02, 0x2c, 0x00, 0x00 }; - int err; struct revo51_spec *spec; spec = kzalloc(sizeof(*spec), GFP_KERNEL); @@ -489,11 +488,9 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice) return -ENOMEM; ice->spec = spec; - err = snd_ak4114_create(ice->card, - ap192_ak4114_read, - ap192_ak4114_write, - ak4114_init_vals, ak4114_init_txcsb, - ice, &spec->ak4114); + snd_ak4114_create(ice->card, ap192_ak4114_read, ap192_ak4114_write, + ak4114_init_vals, ak4114_init_txcsb, ice, + &spec->ak4114); /* AK4114 in Revo cannot detect external rate correctly. * No reason to stop capture stream due to incorrect checks */ spec->ak4114->check_flags = AK4114_CHECK_NO_RATE;
these variable were initialized with some value, but never used. and so they are safe to be deleted. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> --- i have not given Jaroslav Kysela <perex@perex.cz> in the To list, as in my last mail, all mails bounced with the error: "cant create user output file" sound/pci/ice1712/ice1712.c | 3 +-- sound/pci/ice1712/revo.c | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-)