Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 18:08:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

media: tvp541x: Drop CONFIG_OF ifdeffery

Browse Source 
Drop of_match_ptr() from tvp514x_driver and get rid of ugly CONFIG_OF
if check. This slightly increases the size of tvp514x_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>
This commit is contained in:
Biju Das 2023-09-23 17:36:40 +01:00 committed by Hans Verkuil
parent 0b135b8921
commit 2fa264283d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/i2c/tvp514x.c
View File

@ -20,6 +20,7 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/videodev2.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/v4l2-mediabus.h>
#include <linux/of.h>
@ -1190,7 +1191,6 @@ static const struct i2c_device_id tvp514x_id[] = {
};
MODULE_DEVICE_TABLE(i2c, tvp514x_id);
#if IS_ENABLED(CONFIG_OF)
static const struct of_device_id tvp514x_of_match[] = {
{ .compatible = "ti,tvp5146", .data = tvp5146_init_reg_seq },
{ .compatible = "ti,tvp5146m2", .data = tvp514xm_init_reg_seq },
@ -1199,11 +1199,10 @@ static const struct of_device_id tvp514x_of_match[] = {
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, tvp514x_of_match);
#endif
static struct i2c_driver tvp514x_driver = {
.driver = {
.of_match_table = of_match_ptr(tvp514x_of_match),
.of_match_table = tvp514x_of_match,
.name = TVP514X_MODULE_NAME,
},
.probe = tvp514x_probe,