openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] staging: media: lirc: lirc_zilog.c: fix quoted strings split across lines 

checkpatch makes an exception to the 80-colum rule for quotes strings, and
Documentation/CodingStyle recommends not splitting quotes strings across lines
because it breaks the ability to grep for the string. Fixing these.

WARNING: quoted string split across lines

Signed-off-by: Luis de Bethencourt <luis@debethencourt.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Luis de Bethencourt 2014-12-10 21:22:01 -03:00 committed by Mauro Carvalho Chehab
parent cb9564e133
commit 221ca91220
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/staging/media/lirc/lirc_zilog.c
View File

@ -372,14 +372,14 @@ static int add_to_buf(struct IR *ir)
ret);
if (failures >= 3) {
mutex_unlock(&ir->ir_lock);
dev_err(ir->l.dev, "unable to read from the IR chip "
"after 3 resets, giving up\n");
dev_err(ir->l.dev,
"unable to read from the IR chip after 3 resets, giving up\n");
break;
}
/* Looks like the chip crashed, reset it */
dev_err(ir->l.dev, "polling the IR receiver chip failed, "
"trying reset\n");
dev_err(ir->l.dev,
"polling the IR receiver chip failed, trying reset\n");
set_current_state(TASK_UNINTERRUPTIBLE);
if (kthread_should_stop()) {
@ -405,8 +405,9 @@ static int add_to_buf(struct IR *ir)
ret = i2c_master_recv(rx->c, keybuf, sizeof(keybuf));
mutex_unlock(&ir->ir_lock);
if (ret != sizeof(keybuf)) {
dev_err(ir->l.dev, "i2c_master_recv failed with %d -- "
"keeping last read buffer\n", ret);
dev_err(ir->l.dev,
"i2c_master_recv failed with %d -- keeping last read buffer\n",
ret);
} else {
rx->b[0] = keybuf[3];
rx->b[1] = keybuf[4];
@ -713,8 +714,9 @@ static int send_boot_data(struct IR_tx *tx)
buf[0]);
return 0;
}
dev_notice(tx->ir->l.dev, "Zilog/Hauppauge IR blaster firmware version "
"%d.%d.%d loaded\n", buf[1], buf[2], buf[3]);
dev_notice(tx->ir->l.dev,
"Zilog/Hauppauge IR blaster firmware version %d.%d.%d loaded\n",
buf[1], buf[2], buf[3]);
return 0;
}
@ -792,9 +794,9 @@ static int fw_load(struct IR_tx *tx)
if (!read_uint8(&data, tx_data->endp, &version))
goto corrupt;
if (version != 1) {
dev_err(tx->ir->l.dev, "unsupported code set file version (%u, expected"
"1) -- please upgrade to a newer driver",
version);
dev_err(tx->ir->l.dev,
"unsupported code set file version (%u, expected 1) -- please upgrade to a newer driver",
version);
fw_unload_locked();
ret = -EFAULT;
goto out;
@ -981,8 +983,9 @@ static int send_code(struct IR_tx *tx, unsigned int code, unsigned int key)
ret = get_key_data(data_block, code, key);
if (ret == -EPROTO) {
dev_err(tx->ir->l.dev, "failed to get data for code %u, key %u -- check "
"lircd.conf entries\n", code, key);
dev_err(tx->ir->l.dev,
"failed to get data for code %u, key %u -- check lircd.conf entries\n",
code, key);
return ret;
} else if (ret != 0)
return ret;
@ -1057,12 +1060,14 @@ static int send_code(struct IR_tx *tx, unsigned int code, unsigned int key)
ret = i2c_master_send(tx->c, buf, 1);
if (ret == 1)
break;
dev_dbg(tx->ir->l.dev, "NAK expected: i2c_master_send "
"failed with %d (try %d)\n", ret, i+1);
dev_dbg(tx->ir->l.dev,
"NAK expected: i2c_master_send failed with %d (try %d)\n",
ret, i+1);
}
if (ret != 1) {
dev_err(tx->ir->l.dev, "IR TX chip never got ready: last i2c_master_send "
"failed with %d\n", ret);
dev_err(tx->ir->l.dev,
"IR TX chip never got ready: last i2c_master_send failed with %d\n",
ret);
return ret < 0 ? ret : -EFAULT;
}
@ -1165,12 +1170,12 @@ static ssize_t write(struct file *filep, const char __user *buf, size_t n,
*/
if (ret != 0) {
/* Looks like the chip crashed, reset it */
dev_err(tx->ir->l.dev, "sending to the IR transmitter chip "
"failed, trying reset\n");
dev_err(tx->ir->l.dev,
"sending to the IR transmitter chip failed, trying reset\n");
if (failures >= 3) {
dev_err(tx->ir->l.dev, "unable to send to the IR chip "
"after 3 resets, giving up\n");
dev_err(tx->ir->l.dev,
"unable to send to the IR chip after 3 resets, giving up\n");
mutex_unlock(&ir->ir_lock);
mutex_unlock(&tx->client_lock);
put_ir_tx(tx, false);
@ -1540,8 +1545,9 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
/* Proceed only if the Rx client is also ready or not needed */
if (rx == NULL && !tx_only) {
dev_info(tx->ir->l.dev, "probe of IR Tx on %s (i2c-%d) done. Waiting"
" on IR Rx.\n", adap->name, adap->nr);
dev_info(tx->ir->l.dev,
"probe of IR Tx on %s (i2c-%d) done. Waiting on IR Rx.\n",
adap->name, adap->nr);
goto out_ok;
}
} else {
@ -1579,8 +1585,9 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
"zilog-rx-i2c-%d", adap->nr);
if (IS_ERR(rx->task)) {
ret = PTR_ERR(rx->task);
dev_err(tx->ir->l.dev, "%s: could not start IR Rx polling thread"
"\n", __func__);
dev_err(tx->ir->l.dev,
"%s: could not start IR Rx polling thread\n",
__func__);
/* Failed kthread, so put back the ir ref */
put_ir_device(ir, true);
/* Failure exit, so put back rx ref from i2c_client */
@ -1592,8 +1599,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
/* Proceed only if the Tx client is also ready */
if (tx == NULL) {
pr_info("probe of IR Rx on %s (i2c-%d) done. Waiting"
" on IR Tx.\n", adap->name, adap->nr);
pr_info("probe of IR Rx on %s (i2c-%d) done. Waiting on IR Tx.\n",
adap->name, adap->nr);
goto out_ok;
}
}