media: i2c: adv7180: Drop CONFIG_OF ifdeffery

Drop of_match_ptr() from adv7180_driver and get rid of ugly CONFIG_OF
if check. This slightly increases the size of adv7180_driver on non-OF
system and shouldn't be an issue.

Add mod_devicetable.h include.

It also allows, in case if needed, to enumerate this device via ACPI with
PRP0001 magic.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index fc4f29e74e05c5eaaffbbdef0bc9fe8658f95c94..54134473186bf9b812af0ed7808d0cbc45a5c822 100644 (file)
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2013 Cogent Embedded, Inc.
  * Copyright (C) 2013 Renesas Solutions Corp.
  */
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/errno.h>
@@ -1584,7 +1585,6 @@ static const struct i2c_device_id adv7180_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, adv7180_id);
 
-#ifdef CONFIG_OF
 static const struct of_device_id adv7180_of_id[] = {
        { .compatible = "adi,adv7180", &adv7180_info },
        { .compatible = "adi,adv7180cp", &adv7180_info },
@@ -1600,13 +1600,12 @@ static const struct of_device_id adv7180_of_id[] = {
        {}
 };
 MODULE_DEVICE_TABLE(of, adv7180_of_id);
-#endif
 
 static struct i2c_driver adv7180_driver = {
        .driver = {
                   .name = KBUILD_MODNAME,
                   .pm = ADV7180_PM_OPS,
-                  .of_match_table = of_match_ptr(adv7180_of_id),
+                  .of_match_table = adv7180_of_id,
                   },
        .probe = adv7180_probe,
        .remove = adv7180_remove,