Re: [PATCH v5 2/9] media: adv748x: include everything adv748x.h needs into the file

[Kieran Bingham]

Hi Alex,

On 02/04/2020 19:34, Alex Riesen wrote:
> To follow the established practice of not depending on others to
> pull everything in. While at it, make sure it stays like this.

Good call!

Small extra trivial comment below...

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx>

> Signed-off-by: Alexander Riesen <alexander.riesen@xxxxxxxxxxx>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
>  drivers/media/i2c/adv748x/adv748x-afe.c  | 6 ++----
>  drivers/media/i2c/adv748x/adv748x-core.c | 6 ++----
>  drivers/media/i2c/adv748x/adv748x-csi2.c | 6 ++----
>  drivers/media/i2c/adv748x/adv748x-hdmi.c | 6 ++----
>  drivers/media/i2c/adv748x/adv748x.h      | 2 ++
>  5 files changed, 10 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/media/i2c/adv748x/adv748x-afe.c b/drivers/media/i2c/adv748x/adv748x-afe.c
> index dbbb1e4d6363..5a25d1fbe25f 100644
> --- a/drivers/media/i2c/adv748x/adv748x-afe.c
> +++ b/drivers/media/i2c/adv748x/adv748x-afe.c
> @@ -6,18 +6,16 @@
>   * Copyright (C) 2017 Renesas Electronics Corp.
>   */
>  
> +#include "adv748x.h"
> +
>  #include <linux/delay.h>
>  #include <linux/module.h>
>  #include <linux/mutex.h>
>  #include <linux/v4l2-dv-timings.h>
>  
> -#include <media/v4l2-ctrls.h>
> -#include <media/v4l2-device.h>
>  #include <media/v4l2-dv-timings.h>
>  #include <media/v4l2-ioctl.h>
>  
> -#include "adv748x.h"
> -
>  /* -----------------------------------------------------------------------------
>   * SDP
>   */
> diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
> index c3fb113cef62..5c59aad319d1 100644
> --- a/drivers/media/i2c/adv748x/adv748x-core.c
> +++ b/drivers/media/i2c/adv748x/adv748x-core.c
> @@ -10,6 +10,8 @@
>   *	Kieran Bingham <kieran.bingham@xxxxxxxxxxxxxxxx>
>   */
>  
> +#include "adv748x.h"
> +
>  #include <linux/delay.h>
>  #include <linux/errno.h>
>  #include <linux/i2c.h>

As linux/i2c.h is included in adv748x.h, we can remove this entry.

> @@ -20,14 +22,10 @@
>  #include <linux/slab.h>
>  #include <linux/v4l2-dv-timings.h>
>  
> -#include <media/v4l2-ctrls.h>
> -#include <media/v4l2-device.h>
>  #include <media/v4l2-dv-timings.h>
>  #include <media/v4l2-fwnode.h>
>  #include <media/v4l2-ioctl.h>
>  
> -#include "adv748x.h"
> -
>  /* -----------------------------------------------------------------------------
>   * Register manipulation
>   */
> diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c
> index c43ce5d78723..c00d4f347d95 100644
> --- a/drivers/media/i2c/adv748x/adv748x-csi2.c
> +++ b/drivers/media/i2c/adv748x/adv748x-csi2.c
> @@ -5,15 +5,13 @@
>   * Copyright (C) 2017 Renesas Electronics Corp.
>   */
>  
> +#include "adv748x.h"
> +
>  #include <linux/module.h>
>  #include <linux/mutex.h>
>  
> -#include <media/v4l2-ctrls.h>
> -#include <media/v4l2-device.h>
>  #include <media/v4l2-ioctl.h>
>  
> -#include "adv748x.h"
> -
>  static int adv748x_csi2_set_virtual_channel(struct adv748x_csi2 *tx,
>  					    unsigned int vc)
>  {
> diff --git a/drivers/media/i2c/adv748x/adv748x-hdmi.c b/drivers/media/i2c/adv748x/adv748x-hdmi.c
> index c557f8fdf11a..f598acec3b5c 100644
> --- a/drivers/media/i2c/adv748x/adv748x-hdmi.c
> +++ b/drivers/media/i2c/adv748x/adv748x-hdmi.c
> @@ -5,18 +5,16 @@
>   * Copyright (C) 2017 Renesas Electronics Corp.
>   */
>  
> +#include "adv748x.h"
> +
>  #include <linux/module.h>
>  #include <linux/mutex.h>
>  
> -#include <media/v4l2-ctrls.h>
> -#include <media/v4l2-device.h>
>  #include <media/v4l2-dv-timings.h>
>  #include <media/v4l2-ioctl.h>
>  
>  #include <uapi/linux/v4l2-dv-timings.h>
>  
> -#include "adv748x.h"
> -
>  /* -----------------------------------------------------------------------------
>   * HDMI and CP
>   */
> diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h
> index fccb388ce179..09aab4138c3f 100644
> --- a/drivers/media/i2c/adv748x/adv748x.h
> +++ b/drivers/media/i2c/adv748x/adv748x.h
> @@ -19,6 +19,8 @@
>   */
>  
>  #include <linux/i2c.h>
> +#include <media/v4l2-ctrls.h>
> +#include <media/v4l2-device.h>
>  
>  #ifndef _ADV748X_H_
>  #define _ADV748X_H_
> 

-- 
Regards
--
Kieran