1 files changed, 3 insertions, 62 deletions

diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c
index 6059a1f1e151..db62c652dfc5 100644
--- a/drivers/media/IR/ir-nec-decoder.c
+++ b/drivers/media/IR/ir-nec-decoder.c
@@ -43,7 +43,6 @@ enum nec_state {
 struct decoder_data {
         struct list_head        list;
         struct ir_input_dev     *ir_dev;
-        int                     enabled:1;
 
         /* State machine control */
         enum nec_state          state;
@@ -71,53 +70,6 @@ static struct decoder_data *get_decoder_data(struct  ir_input_dev *ir_dev)
         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   = "nec_decoder",
-        .attrs  = decoder_attributes,
-};
-
 /**
  * ir_nec_decode() - Decode one NEC pulse or space
  * @input_dev:  the struct input_dev descriptor of the device
@@ -136,7 +88,7 @@ static int ir_nec_decode(struct input_dev *input_dev, struct ir_raw_event ev)
         if (!data)
                 return -EINVAL;
 
-        if (!data->enabled)
+        if (!(ir_dev->raw->enabled_protocols & IR_TYPE_NEC))
                 return 0;
 
         if (IS_RESET(ev)) {
@@ -260,22 +212,12 @@ static int ir_nec_register(struct input_dev *input_dev)
 {
         struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
         struct decoder_data *data;
-        u64 ir_type = ir_dev->rc_tab.ir_type;
-        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);
+        if (!data)
                 return -ENOMEM;
-        }
 
         data->ir_dev = ir_dev;
-        if (ir_type == IR_TYPE_NEC || ir_type == IR_TYPE_UNKNOWN)
-                data->enabled = 1;
 
         spin_lock(&decoder_lock);
         list_add_tail(&data->list, &decoder_list);
@@ -293,8 +235,6 @@ static int ir_nec_unregister(struct input_dev *input_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);
@@ -303,6 +243,7 @@ static int ir_nec_unregister(struct input_dev *input_dev)
 }
 
 static struct ir_raw_handler nec_handler = {
+        .protocols      = IR_TYPE_NEC,
         .decode         = ir_nec_decode,
         .raw_register   = ir_nec_register,
         .raw_unregister = ir_nec_unregister,