V4L/DVB: v4l2_subdev: Get rid of now unused IR pulse width defines

Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx25840/cx25840-ir.c b/drivers/media/video/cx25840/cx25840-ir.c
index 34e284b..c2b4c14 100644 (file)
--- a/drivers/media/video/cx25840/cx25840-ir.c
+++ b/drivers/media/video/cx25840/cx25840-ir.c
@@ -886,10 +886,10 @@ static int cx25840_ir_tx_write(struct v4l2_subdev *sd, u8 *buf, size_t count,
         */
        for (i = 0; i < n; ) {
                for (j = 0; j < FIFO_TX_DEPTH / 2 && i < n; j++) {
-                       mark = ns_pulse[i] & V4L2_SUBDEV_IR_PULSE_LEVEL_MASK;
+                       mark = ns_pulse[i] & LEVEL_MASK;
                        fifo_pulse[j] = ns_to_pulse_width_count(
                                         ns_pulse[i] &
-                                              ~V4L2_SUBDEV_IR_PULSE_LEVEL_MASK,
+                                              ~LEVEL_MASK,
                                         ir_state->txclk_divider);
                        if (mark)
                                fifo_pulse[j] &= FIFO_RXTX_LVL;

diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index bacd525..08880dd 100644 (file)
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -360,14 +360,9 @@ struct v4l2_subdev_sensor_ops {
  */
 
 enum v4l2_subdev_ir_mode {
-       V4L2_SUBDEV_IR_MODE_PULSE_WIDTH, /* space & mark widths in nanosecs */
+       V4L2_SUBDEV_IR_MODE_PULSE_WIDTH, /* uses struct ir_raw_event records */
 };
 
-/* Data format of data read or written for V4L2_SUBDEV_IR_MODE_PULSE_WIDTH */
-#define V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS      0x7fffffff
-#define V4L2_SUBDEV_IR_PULSE_LEVEL_MASK                0x80000000
-#define V4L2_SUBDEV_IR_PULSE_RX_SEQ_END                0xffffffff
-
 struct v4l2_subdev_ir_parameters {
        /* Either Rx or Tx */
        unsigned int bytes_per_data_element; /* of data in read or write call */