Commit 27b795ad authored by Yong Zhi's avatar Yong Zhi Committed by Mauro Carvalho Chehab
Browse files

media: ipu3-imgu: Prefix functions with imgu_* instead of ipu3_* 



This addresses the below TODO item, no function related changes:

- Prefix imgu for all public APIs, i.e. change ipu3_v4l2_register() to
  imgu_v4l2_register(). (Sakari)

The changes were obtained by applying the following perl script
to driver code under drivers/staging/media/ipu3/.

perl -pi.back -e 's/ipu3_(?!uapi)/imgu_/g;'

Signed-off-by: default avatarYong Zhi <yong.zhi@intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 1d4c41f3

drivers/staging/media/ipu3/TODO

+0 −3
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ staging directory. 
- Using ENABLED and IMMUTABLE link flags for the links where those are

  relevant. (Sakari)



- Prefix imgu for all public APIs, i.e. change ipu3_v4l2_register() to

  imgu_v4l2_register(). (Sakari)



- IPU3 driver documentation (Laurent)

  Add diagram in driver rst to describe output capability.

  Comments on configuring v4l2 subdevs for CIO2 and ImgU.

drivers/staging/media/ipu3/ipu3-css-fw.c

+9 −9
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include "ipu3-css-fw.h"

#include "ipu3-dmamap.h"



static void ipu3_css_fw_show_binary(struct device *dev, struct imgu_fw_info *bi,

static void imgu_css_fw_show_binary(struct device *dev, struct imgu_fw_info *bi,

				    const char *name)

{

	unsigned int i;
@@ -54,7 +54,7 @@ static void ipu3_css_fw_show_binary(struct device *dev, struct imgu_fw_info *bi, 
	dev_dbg(dev, "\n");

}



unsigned int ipu3_css_fw_obgrid_size(const struct imgu_fw_info *bi)

unsigned int imgu_css_fw_obgrid_size(const struct imgu_fw_info *bi)

{

	unsigned int width = DIV_ROUND_UP(bi->info.isp.sp.internal.max_width,

					  IMGU_OBGRID_TILE_SIZE * 2) + 1;
@@ -69,7 +69,7 @@ unsigned int ipu3_css_fw_obgrid_size(const struct imgu_fw_info *bi) 
	return obgrid_size;

}



void *ipu3_css_fw_pipeline_params(struct ipu3_css *css, unsigned int pipe,

void *imgu_css_fw_pipeline_params(struct imgu_css *css, unsigned int pipe,

				  enum imgu_abi_param_class cls,

				  enum imgu_abi_memories mem,

				  struct imgu_fw_isp_parameter *par,
@@ -91,7 +91,7 @@ void *ipu3_css_fw_pipeline_params(struct ipu3_css *css, unsigned int pipe, 
	return binary_params + par->offset;

}



void ipu3_css_fw_cleanup(struct ipu3_css *css)

void imgu_css_fw_cleanup(struct imgu_css *css)

{

	struct imgu_device *imgu = dev_get_drvdata(css->dev);
@@ -99,7 +99,7 @@ void ipu3_css_fw_cleanup(struct ipu3_css *css) 
		unsigned int i;



		for (i = 0; i < css->fwp->file_header.binary_nr; i++)

			ipu3_dmamap_free(imgu, &css->binary[i]);

			imgu_dmamap_free(imgu, &css->binary[i]);

		kfree(css->binary);

	}

	if (css->fw)
@@ -109,7 +109,7 @@ void ipu3_css_fw_cleanup(struct ipu3_css *css) 
	css->fw = NULL;

}



int ipu3_css_fw_init(struct ipu3_css *css)

int imgu_css_fw_init(struct imgu_css *css)

{

	static const u32 BLOCK_MAX = 65536;

	struct imgu_device *imgu = dev_get_drvdata(css->dev);
@@ -227,7 +227,7 @@ int ipu3_css_fw_init(struct ipu3_css *css) 
		    css->fw->size)

			goto bad_fw;



		ipu3_css_fw_show_binary(dev, bi, name);

		imgu_css_fw_show_binary(dev, bi, name);

	}



	if (css->fw_bl == -1 || css->fw_sp[0] == -1 || css->fw_sp[1] == -1)
@@ -246,7 +246,7 @@ int ipu3_css_fw_init(struct ipu3_css *css) 
		void *blob = (void *)css->fwp + bi->blob.offset;

		size_t size = bi->blob.size;



		if (!ipu3_dmamap_alloc(imgu, &css->binary[i], size)) {

		if (!imgu_dmamap_alloc(imgu, &css->binary[i], size)) {

			r = -ENOMEM;

			goto error_out;

		}
@@ -260,6 +260,6 @@ int ipu3_css_fw_init(struct ipu3_css *css) 
	r = -ENODEV;



error_out:

	ipu3_css_fw_cleanup(css);

	imgu_css_fw_cleanup(css);

	return r;

}

drivers/staging/media/ipu3/ipu3-css-fw.h

+4 −4
Original line number Diff line number Diff line
@@ -175,11 +175,11 @@ struct imgu_fw_header { 


/******************* Firmware functions *******************/



int ipu3_css_fw_init(struct ipu3_css *css);

void ipu3_css_fw_cleanup(struct ipu3_css *css);

int imgu_css_fw_init(struct imgu_css *css);

void imgu_css_fw_cleanup(struct imgu_css *css);



unsigned int ipu3_css_fw_obgrid_size(const struct imgu_fw_info *bi);

void *ipu3_css_fw_pipeline_params(struct ipu3_css *css, unsigned int pipe,

unsigned int imgu_css_fw_obgrid_size(const struct imgu_fw_info *bi);

void *imgu_css_fw_pipeline_params(struct imgu_css *css, unsigned int pipe,

				  enum imgu_abi_param_class cls,

				  enum imgu_abi_memories mem,

				  struct imgu_fw_isp_parameter *par,

drivers/staging/media/ipu3/ipu3-css-params.c

+135 −135

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/media/ipu3/ipu3-css-params.h

+4 −4
Original line number Diff line number Diff line
@@ -4,23 +4,23 @@ 
#ifndef __IPU3_PARAMS_H

#define __IPU3_PARAMS_H



int ipu3_css_cfg_acc(struct ipu3_css *css, unsigned int pipe,

int imgu_css_cfg_acc(struct imgu_css *css, unsigned int pipe,

		     struct ipu3_uapi_flags *use,

		     struct imgu_abi_acc_param *acc,

		     struct imgu_abi_acc_param *acc_old,

		     struct ipu3_uapi_acc_param *acc_user);



int ipu3_css_cfg_vmem0(struct ipu3_css *css, unsigned int pipe,

int imgu_css_cfg_vmem0(struct imgu_css *css, unsigned int pipe,

		       struct ipu3_uapi_flags *use,

		       void *vmem0, void *vmem0_old,

		       struct ipu3_uapi_params *user);



int ipu3_css_cfg_dmem0(struct ipu3_css *css, unsigned int pipe,

int imgu_css_cfg_dmem0(struct imgu_css *css, unsigned int pipe,

		       struct ipu3_uapi_flags *use,

		       void *dmem0, void *dmem0_old,

		       struct ipu3_uapi_params *user);



void ipu3_css_cfg_gdc_table(struct imgu_abi_gdc_warp_param *gdc,

void imgu_css_cfg_gdc_table(struct imgu_abi_gdc_warp_param *gdc,

			    int frame_in_x, int frame_in_y,

			    int frame_out_x, int frame_out_y,

			    int env_w, int env_h);