mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 08:02:07 +00:00
media: camss: Move and unexport functions specific to ISPIF
Common exported functions msm_vfe_get_vfe_id() and msm_vfe_get_vfe_line_id() do not have any users outside of camss-ispif.c, move them to the latter object and staticize. The change is supposed to be a non-functional one. Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> Reviewed-by: Robert Foss <robert.foss@linaro.org> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
a3a2efca36
commit
7e89476b59
@ -1252,6 +1252,41 @@ static enum ispif_intf ispif_get_intf(enum vfe_line_id line_id)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* ispif_get_vfe_id - Get VFE HW module id
|
||||
* @entity: Pointer to VFE media entity structure
|
||||
* @id: Return CSID HW module id here
|
||||
*/
|
||||
static void ispif_get_vfe_id(struct media_entity *entity, u8 *id)
|
||||
{
|
||||
struct v4l2_subdev *sd;
|
||||
struct vfe_line *line;
|
||||
struct vfe_device *vfe;
|
||||
|
||||
sd = media_entity_to_v4l2_subdev(entity);
|
||||
line = v4l2_get_subdevdata(sd);
|
||||
vfe = to_vfe(line);
|
||||
|
||||
*id = vfe->id;
|
||||
}
|
||||
|
||||
/*
|
||||
* ispif_get_vfe_line_id - Get VFE line id by media entity
|
||||
* @entity: Pointer to VFE media entity structure
|
||||
* @id: Return VFE line id here
|
||||
*/
|
||||
static void ispif_get_vfe_line_id(struct media_entity *entity,
|
||||
enum vfe_line_id *id)
|
||||
{
|
||||
struct v4l2_subdev *sd;
|
||||
struct vfe_line *line;
|
||||
|
||||
sd = media_entity_to_v4l2_subdev(entity);
|
||||
line = v4l2_get_subdevdata(sd);
|
||||
|
||||
*id = line->id;
|
||||
}
|
||||
|
||||
/*
|
||||
* ispif_link_setup - Setup ISPIF connections
|
||||
* @entity: Pointer to media entity structure
|
||||
@ -1285,8 +1320,8 @@ static int ispif_link_setup(struct media_entity *entity,
|
||||
sd = media_entity_to_v4l2_subdev(entity);
|
||||
line = v4l2_get_subdevdata(sd);
|
||||
|
||||
msm_vfe_get_vfe_id(remote->entity, &line->vfe_id);
|
||||
msm_vfe_get_vfe_line_id(remote->entity, &id);
|
||||
ispif_get_vfe_id(remote->entity, &line->vfe_id);
|
||||
ispif_get_vfe_line_id(remote->entity, &id);
|
||||
line->interface = ispif_get_intf(id);
|
||||
}
|
||||
}
|
||||
|
@ -1422,40 +1422,6 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* msm_vfe_get_vfe_id - Get VFE HW module id
|
||||
* @entity: Pointer to VFE media entity structure
|
||||
* @id: Return CSID HW module id here
|
||||
*/
|
||||
void msm_vfe_get_vfe_id(struct media_entity *entity, u8 *id)
|
||||
{
|
||||
struct v4l2_subdev *sd;
|
||||
struct vfe_line *line;
|
||||
struct vfe_device *vfe;
|
||||
|
||||
sd = media_entity_to_v4l2_subdev(entity);
|
||||
line = v4l2_get_subdevdata(sd);
|
||||
vfe = to_vfe(line);
|
||||
|
||||
*id = vfe->id;
|
||||
}
|
||||
|
||||
/*
|
||||
* msm_vfe_get_vfe_line_id - Get VFE line id by media entity
|
||||
* @entity: Pointer to VFE media entity structure
|
||||
* @id: Return VFE line id here
|
||||
*/
|
||||
void msm_vfe_get_vfe_line_id(struct media_entity *entity, enum vfe_line_id *id)
|
||||
{
|
||||
struct v4l2_subdev *sd;
|
||||
struct vfe_line *line;
|
||||
|
||||
sd = media_entity_to_v4l2_subdev(entity);
|
||||
line = v4l2_get_subdevdata(sd);
|
||||
|
||||
*id = line->id;
|
||||
}
|
||||
|
||||
/*
|
||||
* vfe_link_setup - Setup VFE connections
|
||||
* @entity: Pointer to media entity structure
|
||||
|
@ -163,9 +163,6 @@ int msm_vfe_register_entities(struct vfe_device *vfe,
|
||||
|
||||
void msm_vfe_unregister_entities(struct vfe_device *vfe);
|
||||
|
||||
void msm_vfe_get_vfe_id(struct media_entity *entity, u8 *id);
|
||||
void msm_vfe_get_vfe_line_id(struct media_entity *entity, enum vfe_line_id *id);
|
||||
|
||||
/*
|
||||
* vfe_buf_add_pending - Add output buffer to list of pending
|
||||
* @output: VFE output
|
||||
|
Loading…
Reference in New Issue
Block a user