Commit 1cff399e authored by Brian Waters's avatar Brian Waters Committed by Takashi Iwai

ALSA: i2c: Fixed 8 checkpatch errors

Fixed 8 checkpatch errors (ERROR: do not use assignment in if condition)
in sound/i2c/i2c.c.
Signed-off-by: default avatarBrian Waters <brianmwaters@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 96d9e9c0
...@@ -98,7 +98,8 @@ int snd_i2c_bus_create(struct snd_card *card, const char *name, ...@@ -98,7 +98,8 @@ int snd_i2c_bus_create(struct snd_card *card, const char *name,
bus->master = master; bus->master = master;
} }
strlcpy(bus->name, name, sizeof(bus->name)); strlcpy(bus->name, name, sizeof(bus->name));
if ((err = snd_device_new(card, SNDRV_DEV_BUS, bus, &ops)) < 0) { err = snd_device_new(card, SNDRV_DEV_BUS, bus, &ops);
if (err < 0) {
snd_i2c_bus_free(bus); snd_i2c_bus_free(bus);
return err; return err;
} }
...@@ -246,7 +247,8 @@ static int snd_i2c_bit_sendbyte(struct snd_i2c_bus *bus, unsigned char data) ...@@ -246,7 +247,8 @@ static int snd_i2c_bit_sendbyte(struct snd_i2c_bus *bus, unsigned char data)
for (i = 7; i >= 0; i--) for (i = 7; i >= 0; i--)
snd_i2c_bit_send(bus, !!(data & (1 << i))); snd_i2c_bit_send(bus, !!(data & (1 << i)));
if ((err = snd_i2c_bit_ack(bus)) < 0) err = snd_i2c_bit_ack(bus);
if (err < 0)
return err; return err;
return 0; return 0;
} }
...@@ -278,12 +280,14 @@ static int snd_i2c_bit_sendbytes(struct snd_i2c_device *device, ...@@ -278,12 +280,14 @@ static int snd_i2c_bit_sendbytes(struct snd_i2c_device *device,
if (device->flags & SND_I2C_DEVICE_ADDRTEN) if (device->flags & SND_I2C_DEVICE_ADDRTEN)
return -EIO; /* not yet implemented */ return -EIO; /* not yet implemented */
snd_i2c_bit_start(bus); snd_i2c_bit_start(bus);
if ((err = snd_i2c_bit_sendbyte(bus, device->addr << 1)) < 0) { err = snd_i2c_bit_sendbyte(bus, device->addr << 1);
if (err < 0) {
snd_i2c_bit_hw_stop(bus); snd_i2c_bit_hw_stop(bus);
return err; return err;
} }
while (count-- > 0) { while (count-- > 0) {
if ((err = snd_i2c_bit_sendbyte(bus, *bytes++)) < 0) { err = snd_i2c_bit_sendbyte(bus, *bytes++);
if (err < 0) {
snd_i2c_bit_hw_stop(bus); snd_i2c_bit_hw_stop(bus);
return err; return err;
} }
...@@ -302,12 +306,14 @@ static int snd_i2c_bit_readbytes(struct snd_i2c_device *device, ...@@ -302,12 +306,14 @@ static int snd_i2c_bit_readbytes(struct snd_i2c_device *device,
if (device->flags & SND_I2C_DEVICE_ADDRTEN) if (device->flags & SND_I2C_DEVICE_ADDRTEN)
return -EIO; /* not yet implemented */ return -EIO; /* not yet implemented */
snd_i2c_bit_start(bus); snd_i2c_bit_start(bus);
if ((err = snd_i2c_bit_sendbyte(bus, (device->addr << 1) | 1)) < 0) { err = snd_i2c_bit_sendbyte(bus, (device->addr << 1) | 1);
if (err < 0) {
snd_i2c_bit_hw_stop(bus); snd_i2c_bit_hw_stop(bus);
return err; return err;
} }
while (count-- > 0) { while (count-- > 0) {
if ((err = snd_i2c_bit_readbyte(bus, count == 0)) < 0) { err = snd_i2c_bit_readbyte(bus, count == 0);
if (err < 0) {
snd_i2c_bit_hw_stop(bus); snd_i2c_bit_hw_stop(bus);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment