| Message ID | 20150323093445.GA558@mwanda (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 034f90b393a3d5c99654f048c4b22b3d05e3a345 |
| Headers | show |
At Mon, 23 Mar 2015 12:34:46 +0300, Dan Carpenter wrote: > > "err" is always a negative error code here, so there is no point in > checking. Removing the check silences a static checker warning and > makes the code a bit more clear. Also we don't need to initialize "err". > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied, thanks. Takashi > > diff --git a/sound/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c > index 8884488..2183e9e 100644 > --- a/sound/i2c/other/ak4113.c > +++ b/sound/i2c/other/ak4113.c > @@ -73,7 +73,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read, > void *private_data, struct ak4113 **r_ak4113) > { > struct ak4113 *chip; > - int err = 0; > + int err; > unsigned char reg; > static struct snd_device_ops ops = { > .dev_free = snd_ak4113_dev_free, > @@ -109,7 +109,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read, > > __fail: > snd_ak4113_free(chip); > - return err < 0 ? err : -EIO; > + return err; > } > EXPORT_SYMBOL_GPL(snd_ak4113_create); > >
diff --git a/sound/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c index 8884488..2183e9e 100644 --- a/sound/i2c/other/ak4113.c +++ b/sound/i2c/other/ak4113.c @@ -73,7 +73,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read, void *private_data, struct ak4113 **r_ak4113) { struct ak4113 *chip; - int err = 0; + int err; unsigned char reg; static struct snd_device_ops ops = { .dev_free = snd_ak4113_dev_free, @@ -109,7 +109,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read, __fail: snd_ak4113_free(chip); - return err < 0 ? err : -EIO; + return err; } EXPORT_SYMBOL_GPL(snd_ak4113_create);
"err" is always a negative error code here, so there is no point in checking. Removing the check silences a static checker warning and makes the code a bit more clear. Also we don't need to initialize "err". Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>