media: lirc: remove name from lirc_dev (bf01c824) · Commits · 戴 / test

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

+1 −1

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

	$ dmesg \|grep lirc_dev		$ dmesg \|grep lirc_dev
	lirc_dev: IR Remote Control driver registered, major 248		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:		What you should see for a chardev:

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -546,8 +546,6 @@ int ir_lirc_register(struct rc_dev *dev)
	if (!ldev)		if (!ldev)
	return rc;		return rc;

	snprintf(ldev->name, sizeof(ldev->name), "ir-lirc-codec (%s)",
	dev->driver_name);
	ldev->fops = &lirc_fops;		ldev->fops = &lirc_fops;
	ldev->dev.parent = &dev->dev;		ldev->dev.parent = &dev->dev;
	ldev->rdev = dev;		ldev->rdev = dev;

+3 −6

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

	/* some safety check 8-) */
	d->name[sizeof(d->name) - 1] = '\0';

	if (rcdev->driver_type == RC_DRIVER_IR_RAW) {		if (rcdev->driver_type == RC_DRIVER_IR_RAW) {
	if (kfifo_alloc(&rcdev->rawir, MAX_IR_EVENT_SIZE, GFP_KERNEL))		if (kfifo_alloc(&rcdev->rawir, MAX_IR_EVENT_SIZE, GFP_KERNEL))
	return -ENOMEM;		return -ENOMEM;
	@@ -131,7 +128,7 @@ int lirc_register_device(struct lirc_dev *d)
	get_device(d->dev.parent);		get_device(d->dev.parent);

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

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

	dev_dbg(&d->dev, "lirc_dev: driver %s unregistered from minor = %d\n",		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);		mutex_lock(&rcdev->lock);

	if (rcdev->lirc_open) {		if (rcdev->lirc_open) {
	dev_dbg(&d->dev, LOGHEAD "releasing opened driver\n",		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);		wake_up_poll(&rcdev->wait_poll, POLLHUP);
	}		}

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@
	/**		/**
	* struct lirc_dev - represents a LIRC device		* struct lirc_dev - represents a LIRC device
	*		*
	* @name: used for logging
	* @minor: the minor device (/dev/lircX) number for the device		* @minor: the minor device (/dev/lircX) number for the device
	* @rdev: &struct rc_dev associated with the device		* @rdev: &struct rc_dev associated with the device
	* @fops: &struct file_operations for the device		* @fops: &struct file_operations for the device
	@@ -30,7 +29,6 @@
	* @cdev: &struct cdev assigned to the device		* @cdev: &struct cdev assigned to the device
	*/		*/
	struct lirc_dev {		struct lirc_dev {
	char name[40];
	unsigned int minor;		unsigned int minor;

	struct rc_dev *rdev;		struct rc_dev *rdev;