Commit bf01c824 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

media: lirc: remove name from lirc_dev 



This is a duplicate of rcdev->driver_name.

Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 111429fb

Documentation/media/uapi/rc/lirc-dev-intro.rst

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Example dmesg output upon a driver registering w/LIRC: 


    $ dmesg |grep lirc_dev

    lirc_dev: IR Remote Control driver registered, major 248

    rc rc0: lirc_dev: driver ir-lirc-codec (mceusb) registered at minor = 0

    rc rc0: lirc_dev: driver mceusb registered at minor = 0



What you should see for a chardev:

drivers/media/rc/ir-lirc-codec.c

+0 −2
Original line number Diff line number Diff line
@@ -546,8 +546,6 @@ int ir_lirc_register(struct rc_dev *dev) 
	if (!ldev)

		return rc;



	snprintf(ldev->name, sizeof(ldev->name), "ir-lirc-codec (%s)",

		 dev->driver_name);

	ldev->fops = &lirc_fops;

	ldev->dev.parent = &dev->dev;

	ldev->rdev = dev;

drivers/media/rc/lirc_dev.c

+3 −6
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ int lirc_register_device(struct lirc_dev *d) 
		return -EINVAL;

	}



	/* some safety check 8-) */

	d->name[sizeof(d->name) - 1] = '\0';



	if (rcdev->driver_type == RC_DRIVER_IR_RAW) {

		if (kfifo_alloc(&rcdev->rawir, MAX_IR_EVENT_SIZE, GFP_KERNEL))

			return -ENOMEM;
@@ -131,7 +128,7 @@ int lirc_register_device(struct lirc_dev *d) 
	get_device(d->dev.parent);



	dev_info(&d->dev, "lirc_dev: driver %s registered at minor = %d\n",

		 d->name, d->minor);

		 rcdev->driver_name, d->minor);



	return 0;

}
@@ -147,13 +144,13 @@ void lirc_unregister_device(struct lirc_dev *d) 
	rcdev = d->rdev;



	dev_dbg(&d->dev, "lirc_dev: driver %s unregistered from minor = %d\n",

		d->name, d->minor);

		rcdev->driver_name, d->minor);



	mutex_lock(&rcdev->lock);



	if (rcdev->lirc_open) {

		dev_dbg(&d->dev, LOGHEAD "releasing opened driver\n",

			d->name, d->minor);

			rcdev->driver_name, d->minor);

		wake_up_poll(&rcdev->wait_poll, POLLHUP);

	}

include/media/lirc_dev.h

+0 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
/**

 * struct lirc_dev - represents a LIRC device

 *

 * @name:		used for logging

 * @minor:		the minor device (/dev/lircX) number for the device

 * @rdev:		&struct rc_dev associated with the device

 * @fops:		&struct file_operations for the device
@@ -30,7 +29,6 @@ 
 * @cdev:		&struct cdev assigned to the device

 */

struct lirc_dev {

	char name[40];

	unsigned int minor;



	struct rc_dev *rdev;