V4L/DVB: ir-core: move decoding state to ir_raw_event_ctrl

This patch moves the state from each raw decoder into the
ir_raw_event_ctrl struct.

This allows the removal of code like this:

        spin_lock(&decoder_lock);
        list_for_each_entry(data, &decoder_list, list) {
                if (data->ir_dev == ir_dev)
                        break;
        }
        spin_unlock(&decoder_lock);
        return data;

which is currently run for each decoder on each event in order
to get the client-specific decoding state data.

In addition, ir decoding modules and ir driver module load
order is now independent. Centralizing the data also allows
for a nice code reduction of about 30% per raw decoder as
client lists and client registration callbacks are no longer
necessary (but still kept around for the benefit of the lirc
decoder).

Out-of-tree modules can still use a similar trick to what
the raw decoders did before this patch until they are merged.

Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Tested-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 10 insertions, 84 deletions

diff --git a/drivers/media/IR/ir-sony-decoder.c b/drivers/media/IR/ir-sony-decoder.c
index e15db3334998..b9074f07c7a0 100644
--- a/drivers/media/IR/ir-sony-decoder.c
+++ b/drivers/media/IR/ir-sony-decoder.c
@@ -23,10 +23,6 @@
 #define SONY_BIT_SPACE          (1 * SONY_UNIT)
 #define SONY_TRAILER_SPACE      (10 * SONY_UNIT) /* minimum */
 
-/* Used to register sony_decoder clients */
-static LIST_HEAD(decoder_list);
-static DEFINE_SPINLOCK(decoder_lock);
-
 enum sony_state {
         STATE_INACTIVE,
         STATE_HEADER_SPACE,
@@ -35,36 +31,6 @@ enum sony_state {
         STATE_FINISHED,
 };
 
-struct decoder_data {
-        struct list_head        list;
-        struct ir_input_dev     *ir_dev;
-
-        /* State machine control */
-        enum sony_state         state;
-        u32                     sony_bits;
-        unsigned                count;
-};
-
-
-/**
- * get_decoder_data()   - gets decoder data
- * @input_dev:  input device
- *
- * Returns the struct decoder_data that corresponds to a device
- */
-static struct decoder_data *get_decoder_data(struct  ir_input_dev *ir_dev)
-{
-        struct decoder_data *data = NULL;
-
-        spin_lock(&decoder_lock);
-        list_for_each_entry(data, &decoder_list, list) {
-                if (data->ir_dev == ir_dev)
-                        break;
-        }
-        spin_unlock(&decoder_lock);
-        return data;
-}
-
 /**
  * ir_sony_decode() - Decode one Sony pulse or space
  * @input_dev:  the struct input_dev descriptor of the device
@@ -74,15 +40,11 @@ static struct decoder_data *get_decoder_data(struct  ir_input_dev *ir_dev)
  */
 static int ir_sony_decode(struct input_dev *input_dev, struct ir_raw_event ev)
 {
-        struct decoder_data *data;
         struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+        struct sony_dec *data = &ir_dev->raw->sony;
         u32 scancode;
         u8 device, subdevice, function;
 
-        data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-
         if (!(ir_dev->raw->enabled_protocols & IR_TYPE_SONY))
                 return 0;
 
@@ -124,9 +86,9 @@ static int ir_sony_decode(struct input_dev *input_dev, struct ir_raw_event ev)
                 if (!ev.pulse)
                         break;
 
-                data->sony_bits <<= 1;
+                data->bits <<= 1;
                 if (eq_margin(ev.duration, SONY_BIT_1_PULSE, SONY_UNIT / 2))
-                        data->sony_bits |= 1;
+                        data->bits |= 1;
                 else if (!eq_margin(ev.duration, SONY_BIT_0_PULSE, SONY_UNIT / 2))
                         break;
 
@@ -160,19 +122,19 @@ static int ir_sony_decode(struct input_dev *input_dev, struct ir_raw_event ev)
 
                 switch (data->count) {
                 case 12:
-                        device    = bitrev8((data->sony_bits <<  3) & 0xF8);
+                        device    = bitrev8((data->bits <<  3) & 0xF8);
                         subdevice = 0;
-                        function  = bitrev8((data->sony_bits >>  4) & 0xFE);
+                        function  = bitrev8((data->bits >>  4) & 0xFE);
                         break;
                 case 15:
-                        device    = bitrev8((data->sony_bits >>  0) & 0xFF);
+                        device    = bitrev8((data->bits >>  0) & 0xFF);
                         subdevice = 0;
-                        function  = bitrev8((data->sony_bits >>  7) & 0xFD);
+                        function  = bitrev8((data->bits >>  7) & 0xFD);
                         break;
                 case 20:
-                        device    = bitrev8((data->sony_bits >>  5) & 0xF8);
-                        subdevice = bitrev8((data->sony_bits >>  0) & 0xFF);
-                        function  = bitrev8((data->sony_bits >> 12) & 0xFE);
+                        device    = bitrev8((data->bits >>  5) & 0xF8);
+                        subdevice = bitrev8((data->bits >>  0) & 0xFF);
+                        function  = bitrev8((data->bits >> 12) & 0xFE);
                         break;
                 default:
                         IR_dprintk(1, "Sony invalid bitcount %u\n", data->count);
@@ -193,45 +155,9 @@ out:
         return -EINVAL;
 }
 
-static int ir_sony_register(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        struct decoder_data *data;
-
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        data->ir_dev = ir_dev;
-
-        spin_lock(&decoder_lock);
-        list_add_tail(&data->list, &decoder_list);
-        spin_unlock(&decoder_lock);
-
-        return 0;
-}
-
-static int ir_sony_unregister(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        static struct decoder_data *data;
-
-        data = get_decoder_data(ir_dev);
-        if (!data)
-                return 0;
-
-        spin_lock(&decoder_lock);
-        list_del(&data->list);
-        spin_unlock(&decoder_lock);
-
-        return 0;
-}
-
 static struct ir_raw_handler sony_handler = {
         .protocols      = IR_TYPE_SONY,
         .decode         = ir_sony_decode,
-        .raw_register   = ir_sony_register,
-        .raw_unregister = ir_sony_unregister,
 };
 
 static int __init ir_sony_decode_init(void)