Commit 2ecd4240 authored by Luis de Bethencourt's avatar Luis de Bethencourt Committed by Mauro Carvalho Chehab
Browse files

[media] staging: media: lirc: lirc_zilog.c: keep consistency in dev functions 



The previous patch switched some dev functions to move the string to a second
line. Doing this for all similar functions because it makes the driver easier
to read if all similar lines use the same criteria.

Signed-off-by: default avatarLuis de Bethencourt <luis@debethencourt.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 221ca912

drivers/staging/media/lirc/lirc_zilog.c

+32 −25
Original line number Diff line number Diff line
@@ -412,7 +412,8 @@ static int add_to_buf(struct IR *ir) 
			rx->b[0] = keybuf[3];

			rx->b[1] = keybuf[4];

			rx->b[2] = keybuf[5];

			dev_dbg(ir->l.dev, "key (0x%02x/0x%02x)\n",

			dev_dbg(ir->l.dev,

				"key (0x%02x/0x%02x)\n",

				rx->b[0], rx->b[1]);

		}
@@ -657,8 +658,8 @@ static int send_data_block(struct IR_tx *tx, unsigned char *data_block) 
		dev_dbg(tx->ir->l.dev, "%*ph", 5, buf);

		ret = i2c_master_send(tx->c, buf, tosend + 1);

		if (ret != tosend + 1) {

			dev_err(tx->ir->l.dev, "i2c_master_send failed with %d\n",

					       ret);

			dev_err(tx->ir->l.dev,

				"i2c_master_send failed with %d\n", ret);

			return ret < 0 ? ret : -EFAULT;

		}

		i += tosend;
@@ -761,7 +762,8 @@ static int fw_load(struct IR_tx *tx) 
	/* Request codeset data file */

	ret = request_firmware(&fw_entry, "haup-ir-blaster.bin", tx->ir->l.dev);

	if (ret != 0) {

		dev_err(tx->ir->l.dev, "firmware haup-ir-blaster.bin not available (%d)\n",

		dev_err(tx->ir->l.dev,

			"firmware haup-ir-blaster.bin not available (%d)\n",

			ret);

		ret = ret < 0 ? ret : -EFAULT;

		goto out;
@@ -942,7 +944,8 @@ static ssize_t read(struct file *filep, char __user *outbuf, size_t n, 
			unsigned char buf[MAX_XFER_SIZE];



			if (rbuf->chunk_size > sizeof(buf)) {

				dev_err(ir->l.dev, "chunk_size is too big (%d)!\n",

				dev_err(ir->l.dev,

					"chunk_size is too big (%d)!\n",

					rbuf->chunk_size);

				ret = -EINVAL;

				break;
@@ -966,8 +969,8 @@ static ssize_t read(struct file *filep, char __user *outbuf, size_t n, 
	put_ir_rx(rx, false);

	set_current_state(TASK_RUNNING);



	dev_dbg(ir->l.dev, "read result = %d (%s)\n",

			   ret, ret ? "Error" : "OK");

	dev_dbg(ir->l.dev, "read result = %d (%s)\n", ret,

		ret ? "Error" : "OK");



	return ret ? ret : written;

}
@@ -1338,7 +1341,8 @@ static int close(struct inode *node, struct file *filep) 
	struct IR *ir = filep->private_data;



	if (ir == NULL) {

		dev_err(ir->l.dev, "close: no private_data attached to the file!\n");

		dev_err(ir->l.dev,

			"close: no private_data attached to the file!\n");

		return -ENODEV;

	}
@@ -1609,12 +1613,14 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) 
	ir->l.minor = minor; /* module option: user requested minor number */

	ir->l.minor = lirc_register_driver(&ir->l);

	if (ir->l.minor < 0 || ir->l.minor >= MAX_IRCTL_DEVICES) {

		dev_err(tx->ir->l.dev, "%s: \"minor\" must be between 0 and %d (%d)!\n",

		dev_err(tx->ir->l.dev,

			"%s: \"minor\" must be between 0 and %d (%d)!\n",

			__func__, MAX_IRCTL_DEVICES-1, ir->l.minor);

		ret = -EBADRQC;

		goto out_put_xx;

	}

	dev_info(ir->l.dev, "IR unit on %s (i2c-%d) registered as lirc%d and ready\n",

	dev_info(ir->l.dev,

		 "IR unit on %s (i2c-%d) registered as lirc%d and ready\n",

		 adap->name, adap->nr, ir->l.minor);



out_ok:
@@ -1623,7 +1629,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) 
	if (tx != NULL)

		put_ir_tx(tx, true);

	put_ir_device(ir, true);

	dev_info(ir->l.dev, "probe of IR %s on %s (i2c-%d) done\n",

	dev_info(ir->l.dev,

		 "probe of IR %s on %s (i2c-%d) done\n",

		 tx_probe ? "Tx" : "Rx", adap->name, adap->nr);

	mutex_unlock(&ir_devices_lock);

	return 0;
@@ -1636,9 +1643,9 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) 
out_put_ir:

	put_ir_device(ir, true);

out_no_ir:

	dev_err(&client->dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",

		    __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,

		   ret);

	dev_err(&client->dev,

		"%s: probing IR %s on %s (i2c-%d) failed with %d\n",

		__func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr, ret);

	mutex_unlock(&ir_devices_lock);

	return ret;

}