Commit 2d13621c authored by Biju Das's avatar Biju Das Committed by Hans Verkuil
Browse files

media: i2c: ov7670: Drop CONFIG_OF ifdeffery 



Drop of_match_ptr() from ov7670_driver and get rid of ugly CONFIG_OF
if check. This slightly increases the size of ov7670_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 avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent dd2dbf3c

drivers/media/i2c/ov7670.c

+2 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */

#include <linux/clk.h>

#include <linux/init.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/i2c.h>
@@ -1993,18 +1994,16 @@ static const struct i2c_device_id ov7670_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, ov7670_id);



#if IS_ENABLED(CONFIG_OF)

static const struct of_device_id ov7670_of_match[] = {

	{ .compatible = "ovti,ov7670", &ov7670_devdata },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, ov7670_of_match);

#endif



static struct i2c_driver ov7670_driver = {

	.driver = {

		.name	= "ov7670",

		.of_match_table = of_match_ptr(ov7670_of_match),

		.of_match_table = ov7670_of_match,

	},

	.probe		= ov7670_probe,

	.remove		= ov7670_remove,