Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: rc-core: rename ir_raw_event_reset to ir_raw_event_overflow

The driver report a reset event when the hardware reports and overflow.
There is no reason to have a generic "reset" event.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

authored by

Sean Young and committed by
Mauro Carvalho Chehab
950170d6 b2a90f4f

+30 -32
+1 -1
drivers/media/pci/cx23885/cx23885-input.c
··· 55 55 } while (num != 0); 56 56 57 57 if (overrun) 58 - ir_raw_event_reset(kernel_ir->rc); 58 + ir_raw_event_overflow(kernel_ir->rc); 59 59 else if (handle) 60 60 ir_raw_event_handle(kernel_ir->rc); 61 61 }
+1 -1
drivers/media/rc/fintek-cir.c
··· 287 287 if (fintek->rem) 288 288 fintek->parser_state = PARSE_IRDATA; 289 289 else 290 - ir_raw_event_reset(fintek->rdev); 290 + ir_raw_event_overflow(fintek->rdev); 291 291 break; 292 292 case SUBCMD: 293 293 fintek->rem = fintek_cmdsize(fintek->cmd, sample);
+1 -1
drivers/media/rc/igorplugusb.c
··· 67 67 if (overflow > 0) { 68 68 dev_warn(ir->dev, "receive overflow, at least %u lost", 69 69 overflow); 70 - ir_raw_event_reset(ir->rc); 70 + ir_raw_event_overflow(ir->rc); 71 71 } 72 72 73 73 do {
+1 -1
drivers/media/rc/iguanair.c
··· 109 109 break; 110 110 case CMD_RX_OVERFLOW: 111 111 dev_warn(ir->dev, "receive overflow\n"); 112 - ir_raw_event_reset(ir->rc); 112 + ir_raw_event_overflow(ir->rc); 113 113 break; 114 114 default: 115 115 dev_warn(ir->dev, "control code %02x received\n",
+1 -1
drivers/media/rc/ir-hix5hd2.c
··· 194 194 * IR_INTS availably since logic would not clear 195 195 * fifo when overflow, drv do the job 196 196 */ 197 - ir_raw_event_reset(priv->rdev); 197 + ir_raw_event_overflow(priv->rdev); 198 198 symb_num = readl_relaxed(priv->base + IR_DATAH); 199 199 for (i = 0; i < symb_num; i++) 200 200 readl_relaxed(priv->base + IR_DATAL);
+1 -1
drivers/media/rc/ir-imon-decoder.c
··· 95 95 struct imon_dec *data = &dev->raw->imon; 96 96 97 97 if (!is_timing_event(ev)) { 98 - if (ev.reset) 98 + if (ev.overflow) 99 99 data->state = STATE_INACTIVE; 100 100 return 0; 101 101 }
+1 -1
drivers/media/rc/ir-jvc-decoder.c
··· 40 40 struct jvc_dec *data = &dev->raw->jvc; 41 41 42 42 if (!is_timing_event(ev)) { 43 - if (ev.reset) 43 + if (ev.overflow) 44 44 data->state = STATE_INACTIVE; 45 45 return 0; 46 46 }
+1 -1
drivers/media/rc/ir-mce_kbd-decoder.c
··· 221 221 struct lirc_scancode lsc = {}; 222 222 223 223 if (!is_timing_event(ev)) { 224 - if (ev.reset) 224 + if (ev.overflow) 225 225 data->state = STATE_INACTIVE; 226 226 return 0; 227 227 }
+1 -1
drivers/media/rc/ir-nec-decoder.c
··· 44 44 u8 address, not_address, command, not_command; 45 45 46 46 if (!is_timing_event(ev)) { 47 - if (ev.reset) 47 + if (ev.overflow) 48 48 data->state = STATE_INACTIVE; 49 49 return 0; 50 50 }
+1 -1
drivers/media/rc/ir-rc5-decoder.c
··· 45 45 enum rc_proto protocol; 46 46 47 47 if (!is_timing_event(ev)) { 48 - if (ev.reset) 48 + if (ev.overflow) 49 49 data->state = STATE_INACTIVE; 50 50 return 0; 51 51 }
+1 -1
drivers/media/rc/ir-rc6-decoder.c
··· 85 85 enum rc_proto protocol; 86 86 87 87 if (!is_timing_event(ev)) { 88 - if (ev.reset) 88 + if (ev.overflow) 89 89 data->state = STATE_INACTIVE; 90 90 return 0; 91 91 }
+1 -1
drivers/media/rc/ir-rcmm-decoder.c
··· 69 69 return 0; 70 70 71 71 if (!is_timing_event(ev)) { 72 - if (ev.reset) 72 + if (ev.overflow) 73 73 data->state = STATE_INACTIVE; 74 74 return 0; 75 75 }
+2 -2
drivers/media/rc/ir-sanyo-decoder.c
··· 51 51 u8 command, not_command; 52 52 53 53 if (!is_timing_event(ev)) { 54 - if (ev.reset) { 55 - dev_dbg(&dev->dev, "SANYO event reset received. reset to state 0\n"); 54 + if (ev.overflow) { 55 + dev_dbg(&dev->dev, "SANYO event overflow received. reset to state 0\n"); 56 56 data->state = STATE_INACTIVE; 57 57 } 58 58 return 0;
+1 -1
drivers/media/rc/ir-sharp-decoder.c
··· 41 41 u32 msg, echo, address, command, scancode; 42 42 43 43 if (!is_timing_event(ev)) { 44 - if (ev.reset) 44 + if (ev.overflow) 45 45 data->state = STATE_INACTIVE; 46 46 return 0; 47 47 }
+1 -1
drivers/media/rc/ir-sony-decoder.c
··· 39 39 u8 device, subdevice, function; 40 40 41 41 if (!is_timing_event(ev)) { 42 - if (ev.reset) 42 + if (ev.overflow) 43 43 data->state = STATE_INACTIVE; 44 44 return 0; 45 45 }
+1 -1
drivers/media/rc/ir-xmp-decoder.c
··· 37 37 struct xmp_dec *data = &dev->raw->xmp; 38 38 39 39 if (!is_timing_event(ev)) { 40 - if (ev.reset) 40 + if (ev.overflow) 41 41 data->state = STATE_INACTIVE; 42 42 return 0; 43 43 }
+1 -1
drivers/media/rc/ite-cir.c
··· 238 238 /* Check for RX overflow */ 239 239 if (iflags & ITE_IRQ_RX_FIFO_OVERRUN) { 240 240 dev_warn(&dev->rdev->dev, "receive overflow\n"); 241 - ir_raw_event_reset(dev->rdev); 241 + ir_raw_event_overflow(dev->rdev); 242 242 } 243 243 244 244 /* check for the receive interrupt */
+4 -4
drivers/media/rc/lirc_dev.c
··· 41 41 struct lirc_fh *fh; 42 42 int sample; 43 43 44 - /* Packet start */ 45 - if (ev.reset) { 44 + /* Receiver overflow, data missing */ 45 + if (ev.overflow) { 46 46 /* 47 47 * Userspace expects a long space event before the start of 48 48 * the signal to use as a sync. This may be done with repeat 49 - * packets and normal samples. But if a reset has been sent 49 + * packets and normal samples. But if an overflow has been sent 50 50 * then we assume that a long time has passed, so we send a 51 51 * space with the maximum time value. 52 52 */ 53 53 sample = LIRC_SPACE(LIRC_VALUE_MASK); 54 - dev_dbg(&dev->dev, "delivering reset sync space to lirc_dev\n"); 54 + dev_dbg(&dev->dev, "delivering overflow space to lirc_dev\n"); 55 55 56 56 /* Carrier reports */ 57 57 } else if (ev.carrier_report) {
+1 -1
drivers/media/rc/nuvoton-cir.c
··· 742 742 743 743 nvt->pkts = 0; 744 744 nvt_clear_cir_fifo(nvt); 745 - ir_raw_event_reset(nvt->rdev); 745 + ir_raw_event_overflow(nvt->rdev); 746 746 } 747 747 748 748 /* copy data from hardware rx fifo into driver buffer */
+1 -1
drivers/media/rc/rc-core-priv.h
··· 190 190 /* Returns true if event is normal pulse/space event */ 191 191 static inline bool is_timing_event(struct ir_raw_event ev) 192 192 { 193 - return !ev.carrier_report && !ev.reset; 193 + return !ev.carrier_report && !ev.overflow; 194 194 } 195 195 196 196 #define TO_STR(is_pulse) ((is_pulse) ? "pulse" : "space")
-2
drivers/media/rc/rc-ir-raw.c
··· 35 35 !is_transition(&ev, &raw->prev_ev)) 36 36 dev_warn_once(&dev->dev, "two consecutive events of type %s", 37 37 TO_STR(ev.pulse)); 38 - if (raw->prev_ev.reset && ev.pulse == 0) 39 - dev_warn_once(&dev->dev, "timing event after reset should be pulse"); 40 38 } 41 39 list_for_each_entry(handler, &ir_raw_handler_list, list) 42 40 if (dev->enabled_protocols &
+1 -1
drivers/media/rc/st_rc.c
··· 111 111 int_status = readl(dev->rx_base + IRB_RX_INT_STATUS); 112 112 if (unlikely(int_status & IRB_RX_OVERRUN_INT)) { 113 113 /* discard the entire collection in case of errors! */ 114 - ir_raw_event_reset(dev->rdev); 114 + ir_raw_event_overflow(dev->rdev); 115 115 dev_info(dev->dev, "IR RX overrun\n"); 116 116 writel(IRB_RX_OVERRUN_INT, 117 117 dev->rx_base + IRB_RX_INT_CLEAR);
+1 -1
drivers/media/rc/sunxi-cir.c
··· 126 126 } 127 127 128 128 if (status & REG_RXSTA_ROI) { 129 - ir_raw_event_reset(ir->rc); 129 + ir_raw_event_overflow(ir->rc); 130 130 } else if (status & REG_RXSTA_RPE) { 131 131 ir_raw_event_set_idle(ir->rc, true); 132 132 ir_raw_event_handle(ir->rc);
+1 -1
drivers/media/rc/winbond-cir.c
··· 470 470 /* RX overflow? (read clears bit) */ 471 471 if (inb(data->sbase + WBCIR_REG_SP3_LSR) & WBCIR_RX_OVERRUN) { 472 472 data->rxstate = WBCIR_RXSTATE_ERROR; 473 - ir_raw_event_reset(data->dev); 473 + ir_raw_event_overflow(data->dev); 474 474 } 475 475 476 476 /* TX underflow? */
+3 -3
include/media/rc-core.h
··· 298 298 u8 duty_cycle; 299 299 300 300 unsigned pulse:1; 301 - unsigned reset:1; 301 + unsigned overflow:1; 302 302 unsigned timeout:1; 303 303 unsigned carrier_report:1; 304 304 }; ··· 321 321 struct ir_raw_event *events, unsigned int max); 322 322 int ir_raw_encode_carrier(enum rc_proto protocol); 323 323 324 - static inline void ir_raw_event_reset(struct rc_dev *dev) 324 + static inline void ir_raw_event_overflow(struct rc_dev *dev) 325 325 { 326 - ir_raw_event_store(dev, &((struct ir_raw_event) { .reset = true })); 326 + ir_raw_event_store(dev, &((struct ir_raw_event) { .overflow = true })); 327 327 dev->idle = true; 328 328 ir_raw_event_handle(dev); 329 329 }