[PATCH v4 38/45] media: sun6i-csi: Cleanup headers and includes, update copyright lines

Wed Apr 27 12:52:22 PDT 2022

Dne petek, 15. april 2022 ob 17:28:04 CEST je Paul Kocialkowski napisal(a):
> Cleanup includes, update copyright lines and some cosmetic changes.
> 
> Signed-off-by: Paul Kocialkowski <paul.kocialkowski at bootlin.com>

Acked-by: Jernej Skrabec <jernej.skrabec at gmail.com>

Best regards,
Jernej

> ---
>  .../platform/sunxi/sun6i-csi/sun6i_csi.c      | 16 ++++++--------
>  .../platform/sunxi/sun6i-csi/sun6i_csi.h      | 10 ++++-----
>  .../sunxi/sun6i-csi/sun6i_csi_capture.c       |  4 ++--
>  .../sunxi/sun6i-csi/sun6i_csi_capture.h       | 22 ++++++++++++++-----
>  .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h  |  9 ++++----
>  5 files changed, 35 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
> b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index
> 0ae10a11373c..43b6557b3207 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
> @@ -1,18 +1,14 @@
>  // SPDX-License-Identifier: GPL-2.0+
>  /*
>   * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)
> - * All rights reserved.
>   * Author: Yong Deng <yong.deng at magewell.com>
> + * Copyright 2021-2022 Bootlin
> + * Author: Paul Kocialkowski <paul.kocialkowski at bootlin.com>
>   */
> 
>  #include <linux/clk.h>
> -#include <linux/delay.h>
> -#include <linux/dma-mapping.h>
>  #include <linux/err.h>
> -#include <linux/fs.h>
>  #include <linux/interrupt.h>
> -#include <linux/io.h>
> -#include <linux/ioctl.h>
>  #include <linux/module.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> @@ -20,12 +16,13 @@
>  #include <linux/pm_runtime.h>
>  #include <linux/regmap.h>
>  #include <linux/reset.h>
> -#include <linux/sched.h>
> -#include <linux/sizes.h>
> -#include <linux/slab.h>
> +#include <media/v4l2-ctrls.h>
> +#include <media/v4l2-device.h>
>  #include <media/v4l2-mc.h>
> 
>  #include "sun6i_csi.h"
> +#include "sun6i_csi_bridge.h"
> +#include "sun6i_csi_capture.h"
>  #include "sun6i_csi_reg.h"
> 
>  /* Media */
> @@ -390,4 +387,5 @@ module_platform_driver(sun6i_csi_platform_driver);
> 
>  MODULE_DESCRIPTION("Allwinner A31 Camera Sensor Interface driver");
>  MODULE_AUTHOR("Yong Deng <yong.deng at magewell.com>");
> +MODULE_AUTHOR("Paul Kocialkowski <paul.kocialkowski at bootlin.com>");
>  MODULE_LICENSE("GPL");
> diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
> b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h index
> 68611c147996..1aeaef84abba 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
> @@ -1,16 +1,16 @@
>  /* SPDX-License-Identifier: GPL-2.0+ */
>  /*
>   * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)
> - * All rights reserved.
>   * Author: Yong Deng <yong.deng at magewell.com>
> + * Copyright 2021-2022 Bootlin
> + * Author: Paul Kocialkowski <paul.kocialkowski at bootlin.com>
>   */
> 
> -#ifndef __SUN6I_CSI_H__
> -#define __SUN6I_CSI_H__
> +#ifndef _SUN6I_CSI_H_
> +#define _SUN6I_CSI_H_
> 
>  #include <media/v4l2-ctrls.h>
>  #include <media/v4l2-device.h>
> -#include <media/v4l2-fwnode.h>
>  #include <media/videobuf2-v4l2.h>
> 
>  #include "sun6i_csi_bridge.h"
> @@ -51,4 +51,4 @@ struct sun6i_csi_variant {
>  	unsigned long	clock_mod_rate;
>  };
> 
> -#endif /* __SUN6I_CSI_H__ */
> +#endif
> diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
> b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index
> c3b1e1411da4..f1581b877819 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
> @@ -1,13 +1,13 @@
>  // SPDX-License-Identifier: GPL-2.0+
>  /*
>   * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)
> - * All rights reserved.
>   * Author: Yong Deng <yong.deng at magewell.com>
> + * Copyright 2021-2022 Bootlin
> + * Author: Paul Kocialkowski <paul.kocialkowski at bootlin.com>
>   */
> 
>  #include <linux/of.h>
>  #include <linux/regmap.h>
> -
>  #include <media/v4l2-device.h>
>  #include <media/v4l2-event.h>
>  #include <media/v4l2-ioctl.h>
> diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
> b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h index
> 59c57bcefeec..ceceb030aef6 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
> @@ -1,15 +1,15 @@
>  /* SPDX-License-Identifier: GPL-2.0+ */
>  /*
>   * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)
> - * All rights reserved.
>   * Author: Yong Deng <yong.deng at magewell.com>
> + * Copyright 2021-2022 Bootlin
> + * Author: Paul Kocialkowski <paul.kocialkowski at bootlin.com>
>   */
> 
> -#ifndef __SUN6I_CAPTURE_H__
> -#define __SUN6I_CAPTURE_H__
> +#ifndef _SUN6I_CAPTURE_H_
> +#define _SUN6I_CAPTURE_H_
> 
> -#include <media/v4l2-dev.h>
> -#include <media/videobuf2-core.h>
> +#include <media/v4l2-device.h>
> 
>  #define SUN6I_CSI_CAPTURE_NAME	"sun6i-csi-capture"
> 
> @@ -57,21 +57,31 @@ struct sun6i_csi_capture {
>  	struct v4l2_format		format;
>  };
> 
> +/* Helpers */
> +
>  void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,
>  				  unsigned int *width, unsigned 
int *height);
>  void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev,
>  			      u32 *pixelformat, u32 *field);
> 
> +/* Format */
> +
>  const
>  struct sun6i_csi_capture_format *sun6i_csi_capture_format_find(u32
> pixelformat);
> 
> +/* Capture */
> +
>  void sun6i_csi_capture_configure(struct sun6i_csi_device *csi_dev);
>  void sun6i_csi_capture_state_update(struct sun6i_csi_device *csi_dev);
> 
> +/* State */
> +
>  void sun6i_csi_capture_sync(struct sun6i_csi_device *csi_dev);
>  void sun6i_csi_capture_frame_done(struct sun6i_csi_device *csi_dev);
> 
> +/* Capture */
> +
>  int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev);
>  void sun6i_csi_capture_cleanup(struct sun6i_csi_device *csi_dev);
> 
> -#endif /* __SUN6I_CAPTURE_H__ */
> +#endif
> diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
> b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h index
> 1e4a07f26d1d..e01c5b9c2d60 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
> @@ -1,12 +1,13 @@
>  /* SPDX-License-Identifier: GPL-2.0+ */
>  /*
>   * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)
> - * All rights reserved.
>   * Author: Yong Deng <yong.deng at magewell.com>
> + * Copyright 2021-2022 Bootlin
> + * Author: Paul Kocialkowski <paul.kocialkowski at bootlin.com>
>   */
> 
> -#ifndef __SUN6I_CSI_REG_H__
> -#define __SUN6I_CSI_REG_H__
> +#ifndef _SUN6I_CSI_REG_H_
> +#define _SUN6I_CSI_REG_H_
> 
>  #include <linux/kernel.h>
> 
> @@ -180,4 +181,4 @@
>  #define SUN6I_CSI_CH_FIFO_STAT_REG		0x98
>  #define SUN6I_CSI_CH_PCLK_STAT_REG		0x9c
> 
> -#endif /* __SUN6I_CSI_REG_H__ */
> +#endif