leds: lp5562: Properly setup of_device_id table
authorAxel Lin <axel.lin@ingics.com>
Thu, 9 May 2013 04:49:37 +0000 (21:49 -0700)
committerBryan Wu <cooloney@gmail.com>
Thu, 20 Jun 2013 23:21:33 +0000 (16:21 -0700)
Don't mix of_device_id entry in i2c_device_id table.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
drivers/leds/leds-lp5562.c

index e53bcb89a9783b94011ec1309ad8ef11b1ff4907..cbd856dac15041c3c6396741aa7913bfee85ab34 100644 (file)
@@ -587,14 +587,23 @@ static int lp5562_remove(struct i2c_client *client)
 
 static const struct i2c_device_id lp5562_id[] = {
        { "lp5562", 0 },
-       { "ti,lp5562", 0 }, /* OF compatible */
        { }
 };
 MODULE_DEVICE_TABLE(i2c, lp5562_id);
 
+#ifdef CONFIG_OF
+static const struct of_device_id of_lp5562_leds_match[] = {
+       { .compatible = "ti,lp5562", },
+       {},
+};
+
+MODULE_DEVICE_TABLE(of, of_lp5562_leds_match);
+#endif
+
 static struct i2c_driver lp5562_driver = {
        .driver = {
                .name   = "lp5562",
+               .of_match_table = of_match_ptr(of_lp5562_leds_match),
        },
        .probe          = lp5562_probe,
        .remove         = lp5562_remove,