aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2013-03-24 13:58:03 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-25 06:50:24 -0400
commitd230d5ad0bca1c2d90b387549d4eebafabd60569 (patch)
tree21d8efecb241ed15d96e4665af89eece209fd9d8
parentaf2d68d1be24972a79b1616cf7d4d29137841f87 (diff)
[media] em28xx-i2c: do not break strings across lines
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat
-rw-r--r--drivers/media/usb/em28xx/em28xx-i2c.c45
1 files changed, 20 insertions, 25 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c
index 9e2fa41044b3..db40835888d1 100644
--- a/drivers/media/usb/em28xx/em28xx-i2c.c
+++ b/drivers/media/usb/em28xx/em28xx-i2c.c
@@ -68,8 +68,8 @@ static int em2800_i2c_send_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len)
68 /* trigger write */ 68 /* trigger write */
69 ret = dev->em28xx_write_regs(dev, 4 - len, &b2[4 - len], 2 + len); 69 ret = dev->em28xx_write_regs(dev, 4 - len, &b2[4 - len], 2 + len);
70 if (ret != 2 + len) { 70 if (ret != 2 + len) {
71 em28xx_warn("failed to trigger write to i2c address 0x%x " 71 em28xx_warn("failed to trigger write to i2c address 0x%x (error=%i)\n",
72 "(error=%i)\n", addr, ret); 72 addr, ret);
73 return (ret < 0) ? ret : -EIO; 73 return (ret < 0) ? ret : -EIO;
74 } 74 }
75 /* wait for completion */ 75 /* wait for completion */
@@ -81,8 +81,8 @@ static int em2800_i2c_send_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len)
81 } else if (ret == 0x94 + len - 1) { 81 } else if (ret == 0x94 + len - 1) {
82 return -ENODEV; 82 return -ENODEV;
83 } else if (ret < 0) { 83 } else if (ret < 0) {
84 em28xx_warn("failed to get i2c transfer status from " 84 em28xx_warn("failed to get i2c transfer status from bridge register (error=%i)\n",
85 "bridge register (error=%i)\n", ret); 85 ret);
86 return ret; 86 return ret;
87 } 87 }
88 msleep(5); 88 msleep(5);
@@ -110,8 +110,8 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len)
110 buf2[0] = addr; 110 buf2[0] = addr;
111 ret = dev->em28xx_write_regs(dev, 0x04, buf2, 2); 111 ret = dev->em28xx_write_regs(dev, 0x04, buf2, 2);
112 if (ret != 2) { 112 if (ret != 2) {
113 em28xx_warn("failed to trigger read from i2c address 0x%x " 113 em28xx_warn("failed to trigger read from i2c address 0x%x (error=%i)\n",
114 "(error=%i)\n", addr, ret); 114 addr, ret);
115 return (ret < 0) ? ret : -EIO; 115 return (ret < 0) ? ret : -EIO;
116 } 116 }
117 117
@@ -124,8 +124,8 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len)
124 } else if (ret == 0x94 + len - 1) { 124 } else if (ret == 0x94 + len - 1) {
125 return -ENODEV; 125 return -ENODEV;
126 } else if (ret < 0) { 126 } else if (ret < 0) {
127 em28xx_warn("failed to get i2c transfer status from " 127 em28xx_warn("failed to get i2c transfer status from bridge register (error=%i)\n",
128 "bridge register (error=%i)\n", ret); 128 ret);
129 return ret; 129 return ret;
130 } 130 }
131 msleep(5); 131 msleep(5);
@@ -136,9 +136,8 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len)
136 /* get the received message */ 136 /* get the received message */
137 ret = dev->em28xx_read_reg_req_len(dev, 0x00, 4-len, buf2, len); 137 ret = dev->em28xx_read_reg_req_len(dev, 0x00, 4-len, buf2, len);
138 if (ret != len) { 138 if (ret != len) {
139 em28xx_warn("reading from i2c device at 0x%x failed: " 139 em28xx_warn("reading from i2c device at 0x%x failed: couldn't get the received message from the bridge (error=%i)\n",
140 "couldn't get the received message from the bridge " 140 addr, ret);
141 "(error=%i)\n", addr, ret);
142 return (ret < 0) ? ret : -EIO; 141 return (ret < 0) ? ret : -EIO;
143 } 142 }
144 for (i = 0; i < len; i++) 143 for (i = 0; i < len; i++)
@@ -179,12 +178,11 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf,
179 ret = dev->em28xx_write_regs_req(dev, stop ? 2 : 3, addr, buf, len); 178 ret = dev->em28xx_write_regs_req(dev, stop ? 2 : 3, addr, buf, len);
180 if (ret != len) { 179 if (ret != len) {
181 if (ret < 0) { 180 if (ret < 0) {
182 em28xx_warn("writing to i2c device at 0x%x failed " 181 em28xx_warn("writing to i2c device at 0x%x failed (error=%i)\n",
183 "(error=%i)\n", addr, ret); 182 addr, ret);
184 return ret; 183 return ret;
185 } else { 184 } else {
186 em28xx_warn("%i bytes write to i2c device at 0x%x " 185 em28xx_warn("%i bytes write to i2c device at 0x%x requested, but %i bytes written\n",
187 "requested, but %i bytes written\n",
188 len, addr, ret); 186 len, addr, ret);
189 return -EIO; 187 return -EIO;
190 } 188 }
@@ -199,8 +197,8 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf,
199 } else if (ret == 0x10) { 197 } else if (ret == 0x10) {
200 return -ENODEV; 198 return -ENODEV;
201 } else if (ret < 0) { 199 } else if (ret < 0) {
202 em28xx_warn("failed to read i2c transfer status from " 200 em28xx_warn("failed to read i2c transfer status from bridge (error=%i)\n",
203 "bridge (error=%i)\n", ret); 201 ret);
204 return ret; 202 return ret;
205 } 203 }
206 msleep(5); 204 msleep(5);
@@ -243,8 +241,8 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, u16 len)
243 /* Check success of the i2c operation */ 241 /* Check success of the i2c operation */
244 ret = dev->em28xx_read_reg(dev, 0x05); 242 ret = dev->em28xx_read_reg(dev, 0x05);
245 if (ret < 0) { 243 if (ret < 0) {
246 em28xx_warn("failed to read i2c transfer status from " 244 em28xx_warn("failed to read i2c transfer status from bridge (error=%i)\n",
247 "bridge (error=%i)\n", ret); 245 ret);
248 return ret; 246 return ret;
249 } 247 }
250 if (ret > 0) { 248 if (ret > 0) {
@@ -494,12 +492,10 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned bus,
494 dev->hash = em28xx_hash_mem(data, len, 32); 492 dev->hash = em28xx_hash_mem(data, len, 32);
495 mc_start = (data[1] << 8) + 4; /* usually 0x0004 */ 493 mc_start = (data[1] << 8) + 4; /* usually 0x0004 */
496 494
497 em28xx_info("EEPROM ID = %02x %02x %02x %02x, " 495 em28xx_info("EEPROM ID = %02x %02x %02x %02x, EEPROM hash = 0x%08lx\n",
498 "EEPROM hash = 0x%08lx\n",
499 data[0], data[1], data[2], data[3], dev->hash); 496 data[0], data[1], data[2], data[3], dev->hash);
500 em28xx_info("EEPROM info:\n"); 497 em28xx_info("EEPROM info:\n");
501 em28xx_info("\tmicrocode start address = 0x%04x, " 498 em28xx_info("\tmicrocode start address = 0x%04x, boot configuration = 0x%02x\n",
502 "boot configuration = 0x%02x\n",
503 mc_start, data[2]); 499 mc_start, data[2]);
504 /* boot configuration (address 0x0002): 500 /* boot configuration (address 0x0002):
505 * [0] microcode download speed: 1 = 400 kHz; 0 = 100 kHz 501 * [0] microcode download speed: 1 = 400 kHz; 0 = 100 kHz
@@ -552,8 +548,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned bus,
552 data[0] == 0x1a && data[1] == 0xeb && 548 data[0] == 0x1a && data[1] == 0xeb &&
553 data[2] == 0x67 && data[3] == 0x95) { 549 data[2] == 0x67 && data[3] == 0x95) {
554 dev->hash = em28xx_hash_mem(data, len, 32); 550 dev->hash = em28xx_hash_mem(data, len, 32);
555 em28xx_info("EEPROM ID = %02x %02x %02x %02x, " 551 em28xx_info("EEPROM ID = %02x %02x %02x %02x, EEPROM hash = 0x%08lx\n",
556 "EEPROM hash = 0x%08lx\n",
557 data[0], data[1], data[2], data[3], dev->hash); 552 data[0], data[1], data[2], data[3], dev->hash);
558 em28xx_info("EEPROM info:\n"); 553 em28xx_info("EEPROM info:\n");
559 } else { 554 } else {
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-22 20:40:53 -0400