diff options
| author | Sean Young <sean@mess.org> | 2017-09-26 07:56:39 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-12-14 10:35:20 -0500 |
| commit | bf01c82474bf1f5c07d90a0959a95ff51374cc6f (patch) | |
| tree | 3e9d145361289e5648028525b797d292a465bc14 /drivers/media/rc | |
| parent | 111429fb73b1f5f584d977614b87ce9e6f8361c6 (diff) | |
| download | op-kernel-dev-bf01c82474bf1f5c07d90a0959a95ff51374cc6f.zip op-kernel-dev-bf01c82474bf1f5c07d90a0959a95ff51374cc6f.tar.gz | |
media: lirc: remove name from lirc_dev
This is a duplicate of rcdev->driver_name.
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/rc')
| -rw-r--r-- | drivers/media/rc/ir-lirc-codec.c | 2 | ||||
| -rw-r--r-- | drivers/media/rc/lirc_dev.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c index 1e921e4..6435306 100644 --- a/drivers/media/rc/ir-lirc-codec.c +++ b/drivers/media/rc/ir-lirc-codec.c @@ -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; diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c index 32124fb..4ac74fd 100644 --- a/drivers/media/rc/lirc_dev.c +++ b/drivers/media/rc/lirc_dev.c @@ -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); } |
