diff mbox series

[2/2] media: i2c: adv7180: Drop CONFIG_OF ifdeffery

Message ID 20230910152200.56086-3-biju.das.jz@bp.renesas.com (mailing list archive)
State Accepted
Delegated to: Hans Verkuil
Headers
Series Match data improvements for adv7180 driver |

Commit Message

Biju Das Sept. 10, 2023, 3:22 p.m. UTC 
  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>
---
 drivers/media/i2c/adv7180.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Jacopo Mondi Sept. 11, 2023, 8:51 a.m. UTC | #1 
Hi Biju

On Sun, Sep 10, 2023 at 04:22:00PM +0100, Biju Das wrote:
> 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>

Thanks
  j

> ---
>  drivers/media/i2c/adv7180.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
> index fc4f29e74e05..54134473186b 100644
> --- 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,
> --
> 2.25.1
>
diff mbox series

Patch

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index fc4f29e74e05..54134473186b 100644
--- 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,