Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (243 commits)
  V4L/DVB: sms: Convert IR support to use the Remote Controller core
  V4L/DVB: sms: properly initialize IR phys and IR name
  V4L/DVB: standardize names at rc-dib0700 tables
  V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick
  V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5
  V4L/DVB: dib0700: properly implement IR change_protocol
  V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
  V4L/DVB: dib0700: avoid bad repeat
  V4L/DVB: Port dib0700 to rc-core
  V4L/DVB: Add a keymap file with dib0700 table
  V4L/DVB: dvb-usb: add support for rc-core mode
  V4L/DVB: dvb-usb: prepare drivers for using rc-core
  V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key
  V4L/DVB: rj54n1cb0c: fix a comment in the driver
  V4L/DVB: V4L2: sh_vou: VOU does support the full PAL resolution too
  V4L/DVB: V4L2: sh_mobile_camera_ceu: add support for CSI2
  V4L/DVB: V4L2: soc-camera: add a MIPI CSI-2 driver for SH-Mobile platforms
  V4L/DVB: V4L2: soc-camera: export soc-camera bus type for notifications
  V4L/DVB: V4L2: mediabus: add 12-bit Bayer and YUV420 pixel formats
  V4L/DVB: mediabus: fix ambiguous pixel code names
  ...

1 files changed, 12 insertions, 143 deletions

diff --git a/drivers/media/IR/ir-sony-decoder.c b/drivers/media/IR/ir-sony-decoder.c
index 9f440c5c060d..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,84 +31,6 @@ enum sony_state {
         STATE_FINISHED,
 };
 
-struct decoder_data {
-        struct list_head        list;
-        struct ir_input_dev     *ir_dev;
-        int                     enabled:1;
-
-        /* 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;
-}
-
-static ssize_t store_enabled(struct device *d,
-                             struct device_attribute *mattr,
-                             const char *buf,
-                             size_t len)
-{
-        unsigned long value;
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-
-        if (!data)
-                return -EINVAL;
-
-        if (strict_strtoul(buf, 10, &value) || value > 1)
-                return -EINVAL;
-
-        data->enabled = value;
-
-        return len;
-}
-
-static ssize_t show_enabled(struct device *d,
-                             struct device_attribute *mattr, char *buf)
-{
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-
-        if (!data)
-                return -EINVAL;
-
-        if (data->enabled)
-                return sprintf(buf, "1\n");
-        else
-        return sprintf(buf, "0\n");
-}
-
-static DEVICE_ATTR(enabled, S_IRUGO | S_IWUSR, show_enabled, store_enabled);
-
-static struct attribute *decoder_attributes[] = {
-        &dev_attr_enabled.attr,
-        NULL
-};
-
-static struct attribute_group decoder_attribute_group = {
-        .name   = "sony_decoder",
-        .attrs  = decoder_attributes,
-};
-
 /**
  * ir_sony_decode() - Decode one Sony pulse or space
  * @input_dev:  the struct input_dev descriptor of the device
@@ -122,16 +40,12 @@ static struct attribute_group decoder_attribute_group = {
  */
 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 (!data->enabled)
+        if (!(ir_dev->raw->enabled_protocols & IR_TYPE_SONY))
                 return 0;
 
         if (IS_RESET(ev)) {
@@ -172,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;
 
@@ -208,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);
@@ -241,54 +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;
-        int rc;
-
-        rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        if (rc < 0)
-                return rc;
-
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data) {
-                sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-                return -ENOMEM;
-        }
-
-        data->ir_dev = ir_dev;
-        data->enabled = 1;
-
-        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;
-
-        sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-
-        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)