diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-10-12 07:32:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-10-21 08:38:07 -0200 |
| commit | 2a96f60e89b9af8396fe06dc361909b5e3a9b4f0 (patch) | |
| tree | 2968c98fcb5328b5f0115a08005d06520618570f /drivers/media/usb/em28xx/em28xx-camera.c | |
| parent | 8314d40233f3790e4cfa704087bb2a43c18144d7 (diff) | |
| download | linux-2a96f60e89b9af8396fe06dc361909b5e3a9b4f0.tar.gz linux-2a96f60e89b9af8396fe06dc361909b5e3a9b4f0.tar.xz | |
[media] em28xx: convert the remaining printks to pr_foo
There are still several places with printk's called directly.
Convert them to pr_foo() macros, except for the debug printk's,
as those are enabled via modprobe vars.
While here, realign the pr_foo() arguments to match the
recommended CodingStyle.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-camera.c')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-camera.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-camera.c b/drivers/media/usb/em28xx/em28xx-camera.c index bc07166e7df0..a24695474212 100644 --- a/drivers/media/usb/em28xx/em28xx-camera.c +++ b/drivers/media/usb/em28xx/em28xx-camera.c @@ -121,13 +121,13 @@ static int em28xx_probe_sensor_micron(struct em28xx *dev) if (ret < 0) { if (ret != -ENXIO) pr_err("couldn't read from i2c device 0x%02x: error %i\n", - client.addr << 1, ret); + client.addr << 1, ret); continue; } ret = i2c_master_recv(&client, (u8 *)&id_be, 2); if (ret < 0) { pr_err("couldn't read from i2c device 0x%02x: error %i\n", - client.addr << 1, ret); + client.addr << 1, ret); continue; } id = be16_to_cpu(id_be); @@ -136,13 +136,13 @@ static int em28xx_probe_sensor_micron(struct em28xx *dev) ret = i2c_master_send(&client, ®, 1); if (ret < 0) { pr_err("couldn't read from i2c device 0x%02x: error %i\n", - client.addr << 1, ret); + client.addr << 1, ret); continue; } ret = i2c_master_recv(&client, (u8 *)&id_be, 2); if (ret < 0) { pr_err("couldn't read from i2c device 0x%02x: error %i\n", - client.addr << 1, ret); + client.addr << 1, ret); continue; } /* Validate chip ID to be sure we have a Micron device */ @@ -180,8 +180,7 @@ static int em28xx_probe_sensor_micron(struct em28xx *dev) dev->em28xx_sensor = EM28XX_MT9M001; break; default: - pr_info("unknown Micron sensor detected: 0x%04x\n", - id); + pr_info("unknown Micron sensor detected: 0x%04x\n", id); return 0; } @@ -219,7 +218,7 @@ static int em28xx_probe_sensor_omnivision(struct em28xx *dev) if (ret < 0) { if (ret != -ENXIO) pr_err("couldn't read from i2c device 0x%02x: error %i\n", - client.addr << 1, ret); + client.addr << 1, ret); continue; } id = ret << 8; @@ -227,7 +226,7 @@ static int em28xx_probe_sensor_omnivision(struct em28xx *dev) ret = i2c_smbus_read_byte_data(&client, reg); if (ret < 0) { pr_err("couldn't read from i2c device 0x%02x: error %i\n", - client.addr << 1, ret); + client.addr << 1, ret); continue; } id += ret; @@ -239,7 +238,7 @@ static int em28xx_probe_sensor_omnivision(struct em28xx *dev) ret = i2c_smbus_read_byte_data(&client, reg); if (ret < 0) { pr_err("couldn't read from i2c device 0x%02x: error %i\n", - client.addr << 1, ret); + client.addr << 1, ret); continue; } id = ret << 8; @@ -247,7 +246,7 @@ static int em28xx_probe_sensor_omnivision(struct em28xx *dev) ret = i2c_smbus_read_byte_data(&client, reg); if (ret < 0) { pr_err("couldn't read from i2c device 0x%02x: error %i\n", - client.addr << 1, ret); + client.addr << 1, ret); continue; } id += ret; @@ -286,7 +285,7 @@ static int em28xx_probe_sensor_omnivision(struct em28xx *dev) break; default: pr_info("unknown OmniVision sensor detected: 0x%04x\n", - id); + id); return 0; } |