leds: lp5521: Properly setup of_device_id table
authorAxel Lin <axel.lin@ingics.com>
Thu, 9 May 2013 04:48:07 +0000 (21:48 -0700)
committerBryan Wu <cooloney@gmail.com>
Thu, 20 Jun 2013 23:21:32 +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-lp5521.c

index d461e2664b09f7e657da5efd428d2f6a1e38836b..1392feb1bcf7849559ba29b38f163afa01a305bb 100644 (file)
@@ -490,14 +490,22 @@ static int lp5521_remove(struct i2c_client *client)
 
 static const struct i2c_device_id lp5521_id[] = {
        { "lp5521", 0 }, /* Three channel chip */
-       { "national,lp5521", 0 }, /* OF compatible */
        { }
 };
 MODULE_DEVICE_TABLE(i2c, lp5521_id);
 
+#ifdef CONFIG_OF
+static const struct of_device_id of_lp5521_leds_match[] = {
+       { .compatible = "national,lp5521", },
+       {},
+};
+
+MODULE_DEVICE_TABLE(of, of_lp5521_leds_match);
+#endif
 static struct i2c_driver lp5521_driver = {
        .driver = {
                .name   = "lp5521",
+               .of_match_table = of_match_ptr(of_lp5521_leds_match),
        },
        .probe          = lp5521_probe,
        .remove         = lp5521_remove,