Skip to contentSkip to conversation

media: ov2740: make ov2740 driver only work with ACPI

PATCH New Bingbu Cao 1 participant 1 message Jun 4, 2020

Subsystems (3)
lore
Share & tools
lore

Bingbu Cao

author
#0 lore raw

PATCH 1/1 media: ov2740: make ov2740 driver only work with ACPI

As the ACPI id of ov2740 camera sensor was registered as "INT3474", current ov2740 driver is supposed to be working with ACPI only.

---
 drivers/media/i2c/Kconfig  | 1 +
 drivers/media/i2c/ov2740.c | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/media/i2c/Kconfig +1 -0
index da11036ad804..6804ad57ee71 100644
@@ -860,6 +860,7 @@ config VIDEO_OV2685
 config VIDEO_OV2740
 	tristate "OmniVision OV2740 sensor support"
 	depends on VIDEO_V4L2 && I2C
+	depends on ACPI || COMPILE_TEST
 	select MEDIA_CONTROLLER
 	select VIDEO_V4L2_SUBDEV_API
 	select V4L2_FWNODE
drivers/media/i2c/ov2740.c +1 -3
index 2dd2609db873..33025c6d23ac 100644
@@ -988,20 +988,18 @@ static const struct dev_pm_ops ov2740_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(ov2740_suspend, ov2740_resume)
 };
 
-#ifdef CONFIG_ACPI
 static const struct acpi_device_id ov2740_acpi_ids[] = {
 	{"INT3474"},
 	{}
 };
 
 MODULE_DEVICE_TABLE(acpi, ov2740_acpi_ids);
-#endif
 
 static struct i2c_driver ov2740_i2c_driver = {
 	.driver = {
 		.name = "ov2740",
 		.pm = &ov2740_pm_ops,
-		.acpi_match_table = ACPI_PTR(ov2740_acpi_ids),
+		.acpi_match_table = ov2740_acpi_ids,
 	},
 	.probe_new = ov2740_probe,
 	.remove = ov2740_remove,
Signature · 1 line
2.7.4