V4L/DVB (11845): ir-kbd-i2c: Use initialization data

For specific boards, pass initialization data to ir-kbd-i2c instead
of modifying the settings after the device is initialized. This is
more efficient and easier to read.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index cb833a63041c..3a8880243b1f 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -298,7 +298,7 @@ static void ir_work(struct work_struct *work)
 static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
         IR_KEYTAB_TYPE *ir_codes = NULL;
-        char *name;
+        const char *name;
         int ir_type;
         struct IR_i2c *ir;
         struct input_dev *input_dev;
@@ -386,6 +386,16 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 goto err_out_free;
         }
 
+        /* Let the caller override settings */
+        if (client->dev.platform_data) {
+                const struct IR_i2c_init_data *init_data =
+                                                client->dev.platform_data;
+
+                ir_codes = init_data->ir_codes;
+                name = init_data->name;
+                ir->get_key = init_data->get_key;
+        }
+
         /* Sets name */
         snprintf(ir->name, sizeof(ir->name), "i2c IR (%s)", name);
         ir->ir_codes = ir_codes;