diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-11 17:47:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-11 17:47:55 +0000 |
| commit | 031616c434db05ce766f76c62865f55698e0924f (patch) | |
| tree | 7f29aa1ff3e7b51a8058cd570fb785c6e769b245 /drivers/media/rc/rc-main.c | |
| parent | 064841ccfc49b2315dc0b797239862d3a343aa07 (diff) | |
| parent | 85a7555575a0e48f9b73db310d0d762a08a46d63 (diff) | |
Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus
Diffstat (limited to 'drivers/media/rc/rc-main.c')
| -rw-r--r-- | drivers/media/rc/rc-main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index dee8a9f3d80a..1d811e5ffb55 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -747,7 +747,7 @@ void rc_repeat(struct rc_dev *dev) }; if (dev->allowed_protocols != RC_PROTO_BIT_CEC) - ir_lirc_scancode_event(dev, &sc); + lirc_scancode_event(dev, &sc); spin_lock_irqsave(&dev->keylock, flags); @@ -791,7 +791,7 @@ static void ir_do_keydown(struct rc_dev *dev, enum rc_proto protocol, }; if (dev->allowed_protocols != RC_PROTO_BIT_CEC) - ir_lirc_scancode_event(dev, &sc); + lirc_scancode_event(dev, &sc); if (new_event && dev->keypressed) ir_do_keyup(dev, false); @@ -1946,7 +1946,7 @@ int rc_register_device(struct rc_dev *dev) * keycodes with rc_keydown, so lirc must be registered first. */ if (dev->allowed_protocols != RC_PROTO_BIT_CEC) { - rc = ir_lirc_register(dev); + rc = lirc_register(dev); if (rc < 0) goto out_dev; } @@ -1972,7 +1972,7 @@ out_rx: rc_free_rx_device(dev); out_lirc: if (dev->allowed_protocols != RC_PROTO_BIT_CEC) - ir_lirc_unregister(dev); + lirc_unregister(dev); out_dev: device_del(&dev->dev); out_rx_free: @@ -2036,7 +2036,7 @@ void rc_unregister_device(struct rc_dev *dev) * that userspace polling will get notified. */ if (dev->allowed_protocols != RC_PROTO_BIT_CEC) - ir_lirc_unregister(dev); + lirc_unregister(dev); device_del(&dev->dev); |