Commit 56a8c694 authored by Biju Das's avatar Biju Das Committed by Hans Verkuil

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: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarJacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent a142f7bb
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* Copyright (C) 2013 Cogent Embedded, Inc. * Copyright (C) 2013 Cogent Embedded, Inc.
* Copyright (C) 2013 Renesas Solutions Corp. * Copyright (C) 2013 Renesas Solutions Corp.
*/ */
#include <linux/mod_devicetable.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -1584,7 +1585,6 @@ static const struct i2c_device_id adv7180_id[] = { ...@@ -1584,7 +1585,6 @@ static const struct i2c_device_id adv7180_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, adv7180_id); MODULE_DEVICE_TABLE(i2c, adv7180_id);
#ifdef CONFIG_OF
static const struct of_device_id adv7180_of_id[] = { static const struct of_device_id adv7180_of_id[] = {
{ .compatible = "adi,adv7180", &adv7180_info }, { .compatible = "adi,adv7180", &adv7180_info },
{ .compatible = "adi,adv7180cp", &adv7180_info }, { .compatible = "adi,adv7180cp", &adv7180_info },
...@@ -1600,13 +1600,12 @@ static const struct of_device_id adv7180_of_id[] = { ...@@ -1600,13 +1600,12 @@ static const struct of_device_id adv7180_of_id[] = {
{} {}
}; };
MODULE_DEVICE_TABLE(of, adv7180_of_id); MODULE_DEVICE_TABLE(of, adv7180_of_id);
#endif
static struct i2c_driver adv7180_driver = { static struct i2c_driver adv7180_driver = {
.driver = { .driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.pm = ADV7180_PM_OPS, .pm = ADV7180_PM_OPS,
.of_match_table = of_match_ptr(adv7180_of_id), .of_match_table = adv7180_of_id,
}, },
.probe = adv7180_probe, .probe = adv7180_probe,
.remove = adv7180_remove, .remove = adv7180_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment