openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: vsp1: Fix typos 

Several macros were mistakenly prefixed with VPS1 instead of VSP1. Fix
them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Laurent Pinchart 2014-05-27 12:59:39 -03:00 committed by Mauro Carvalho Chehab
parent 9b3e6e2abd
commit 7005a81705
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/platform/vsp1/vsp1.h
View File

@ -36,9 +36,9 @@ struct vsp1_rwpf;
struct vsp1_sru; struct vsp1_sru;
struct vsp1_uds; struct vsp1_uds;
#define VPS1_MAX_RPF 5 #define VSP1_MAX_RPF 5
#define VPS1_MAX_UDS 3 #define VSP1_MAX_UDS 3
#define VPS1_MAX_WPF 4 #define VSP1_MAX_WPF 4
struct vsp1_device { struct vsp1_device {
struct device *dev; struct device *dev;
@ -55,10 +55,10 @@ struct vsp1_device {
struct vsp1_hsit *hst; struct vsp1_hsit *hst;
struct vsp1_lif *lif; struct vsp1_lif *lif;
struct vsp1_lut *lut; struct vsp1_lut *lut;
struct vsp1_rwpf *rpf[VPS1_MAX_RPF]; struct vsp1_rwpf *rpf[VSP1_MAX_RPF];
struct vsp1_sru *sru; struct vsp1_sru *sru;
struct vsp1_uds *uds[VPS1_MAX_UDS]; struct vsp1_uds *uds[VSP1_MAX_UDS];
struct vsp1_rwpf *wpf[VPS1_MAX_WPF]; struct vsp1_rwpf *wpf[VSP1_MAX_WPF];
struct list_head entities; struct list_head entities;

6
drivers/media/platform/vsp1/vsp1_drv.c
View File

@ -440,19 +440,19 @@ static int vsp1_validate_platform_data(struct platform_device *pdev,
return -EINVAL; return -EINVAL;
} }
if (pdata->rpf_count <= 0 || pdata->rpf_count > VPS1_MAX_RPF) { if (pdata->rpf_count <= 0 || pdata->rpf_count > VSP1_MAX_RPF) {
dev_err(&pdev->dev, "invalid number of RPF (%u)\n", dev_err(&pdev->dev, "invalid number of RPF (%u)\n",
pdata->rpf_count); pdata->rpf_count);
return -EINVAL; return -EINVAL;
} }
if (pdata->uds_count <= 0 || pdata->uds_count > VPS1_MAX_UDS) { if (pdata->uds_count <= 0 || pdata->uds_count > VSP1_MAX_UDS) {
dev_err(&pdev->dev, "invalid number of UDS (%u)\n", dev_err(&pdev->dev, "invalid number of UDS (%u)\n",
pdata->uds_count); pdata->uds_count);
return -EINVAL; return -EINVAL;
} }
if (pdata->wpf_count <= 0 || pdata->wpf_count > VPS1_MAX_WPF) { if (pdata->wpf_count <= 0 || pdata->wpf_count > VSP1_MAX_WPF) {
dev_err(&pdev->dev, "invalid number of WPF (%u)\n", dev_err(&pdev->dev, "invalid number of WPF (%u)\n",
pdata->wpf_count); pdata->wpf_count);
return -EINVAL; return -EINVAL;

2
drivers/media/platform/vsp1/vsp1_video.h
View File

@ -73,7 +73,7 @@ struct vsp1_pipeline {
unsigned int num_video; unsigned int num_video;
unsigned int num_inputs; unsigned int num_inputs;
struct vsp1_rwpf *inputs[VPS1_MAX_RPF]; struct vsp1_rwpf *inputs[VSP1_MAX_RPF];
struct vsp1_rwpf *output; struct vsp1_rwpf *output;
struct vsp1_entity *bru; struct vsp1_entity *bru;
struct vsp1_entity *lif; struct vsp1_entity *lif;