media: rc: rename ir_lirc_* functions to lirc_*
Subsystems (2)
Sean Young
maintainerPATCH 1/1 media: rc: rename ir_lirc_* functions to lirc_*
Remove pointless ir_ prefix.
Signed-off-by Sean Young <[email protected]>
--- drivers/media/rc/ir-mce_kbd-decoder.c | 2 +- drivers/media/rc/lirc_dev.c | 55 +++++++++++++-------------- drivers/media/rc/rc-core-priv.h | 20 +++++----- drivers/media/rc/rc-ir-raw.c | 2 +- drivers/media/rc/rc-main.c | 10 ++--- 5 files changed, 44 insertions(+), 45 deletions(-)
drivers/media/rc/ir-mce_kbd-decoder.c +1 -1
@@ -344,7 +344,7 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev) } lsc.scancode = scancode; -ir_lirc_scancode_event (dev, &lsc); +lirc_scancode_event (dev, &lsc); data->state =STATE_INACTIVE ;input_event (dev->input_dev,EV_MSC ,MSC_SCAN , scancode);input_sync (dev->input_dev);
drivers/media/rc/lirc_dev.c +27 -28
148 lines not on this page · raw message
drivers/media/rc/rc-core-priv.h +10 -10
@@ -321,20 +321,20 @@ void ir_raw_init(void);#ifdef CONFIG_LIRC int lirc_dev_init (void );void lirc_dev_exit (void ); -void ir_lirc_raw_event (struct rc_dev *dev,struct ir_raw_event ev); -void ir_lirc_scancode_event (struct rc_dev *dev,struct lirc_scancode *lsc); -int ir_lirc_register (struct rc_dev *dev); -void ir_lirc_unregister (struct rc_dev *dev); +void lirc_raw_event (struct rc_dev *dev,struct ir_raw_event ev); +void lirc_scancode_event (struct rc_dev *dev,struct lirc_scancode *lsc); +int lirc_register (struct rc_dev *dev); +void lirc_unregister (struct rc_dev *dev);struct rc_dev *rc_dev_get_from_fd (int fd);#else static inline int lirc_dev_init (void ) {return 0 ; }static inline void lirc_dev_exit (void ) {} -static inline void ir_lirc_raw_event (struct rc_dev *dev, -struct ir_raw_event ev) { } -static inline void ir_lirc_scancode_event (struct rc_dev *dev, -struct lirc_scancode *lsc) { } -static inline int ir_lirc_register (struct rc_dev *dev) {return 0 ; } -static inline void ir_lirc_unregister (struct rc_dev *dev) { } +static inline void lirc_raw_event (struct rc_dev *dev, +struct ir_raw_event ev) { } +static inline void lirc_scancode_event (struct rc_dev *dev, +struct lirc_scancode *lsc) { } +static inline int lirc_register (struct rc_dev *dev) {return 0 ; } +static inline void lirc_unregister (struct rc_dev *dev) { }#endif /*
drivers/media/rc/rc-ir-raw.c +1 -1
@@ -42,7 +42,7 @@ static int ir_raw_event_thread(void *data)if (dev->enabled_protocols & handler->protocols || !handler->protocols) handler->decode (dev, ev); -ir_lirc_raw_event (dev, ev); +lirc_raw_event (dev, ev); raw->prev_ev = ev; }mutex_unlock (&ir_raw_handler_lock);
drivers/media/rc/rc-main.c +5 -5
@@ -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 @@ int rc_register_device(struct rc_dev *dev)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);
Signature · 1 line
2.26.2