On Wed, May 8, 2013 at 9:48 PM, Axel Lin <axel.lin@xxxxxxxxxx> wrote:
> Don't mix of_device_id entry in i2c_device_id table.
>
Thanks for these fixings. I think they are good for merging.
-Bryan
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>
> ---
> drivers/leds/leds-lp5521.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
> index d461e26..1392feb 100644
> --- a/drivers/leds/leds-lp5521.c
> +++ b/drivers/leds/leds-lp5521.c
> @@ -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,
> --
> 1.8.1.2
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-leds" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
