diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2014-05-27 11:59:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-17 11:44:51 -0400 |
commit | 7005a81705d032887b9f4f808e6dce8e57b8980a (patch) | |
tree | 78ef684dbd3eaf6f3bfa0a9a03b04e11e99b1b72 /drivers/media/platform/vsp1 | |
parent | 9b3e6e2abd7568f9458e927fc4e5eca1b3cde521 (diff) |
[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>
Diffstat (limited to 'drivers/media/platform/vsp1')
-rw-r--r-- | drivers/media/platform/vsp1/vsp1.h | 12 | ||||
-rw-r--r-- | drivers/media/platform/vsp1/vsp1_drv.c | 6 | ||||
-rw-r--r-- | drivers/media/platform/vsp1/vsp1_video.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/platform/vsp1/vsp1.h b/drivers/media/platform/vsp1/vsp1.h index 6ca2cf20d545..3cfa3939157e 100644 --- a/drivers/media/platform/vsp1/vsp1.h +++ b/drivers/media/platform/vsp1/vsp1.h | |||
@@ -36,9 +36,9 @@ struct vsp1_rwpf; | |||
36 | struct vsp1_sru; | 36 | struct vsp1_sru; |
37 | struct vsp1_uds; | 37 | struct vsp1_uds; |
38 | 38 | ||
39 | #define VPS1_MAX_RPF 5 | 39 | #define VSP1_MAX_RPF 5 |
40 | #define VPS1_MAX_UDS 3 | 40 | #define VSP1_MAX_UDS 3 |
41 | #define VPS1_MAX_WPF 4 | 41 | #define VSP1_MAX_WPF 4 |
42 | 42 | ||
43 | struct vsp1_device { | 43 | struct vsp1_device { |
44 | struct device *dev; | 44 | struct device *dev; |
@@ -55,10 +55,10 @@ struct vsp1_device { | |||
55 | struct vsp1_hsit *hst; | 55 | struct vsp1_hsit *hst; |
56 | struct vsp1_lif *lif; | 56 | struct vsp1_lif *lif; |
57 | struct vsp1_lut *lut; | 57 | struct vsp1_lut *lut; |
58 | struct vsp1_rwpf *rpf[VPS1_MAX_RPF]; | 58 | struct vsp1_rwpf *rpf[VSP1_MAX_RPF]; |
59 | struct vsp1_sru *sru; | 59 | struct vsp1_sru *sru; |
60 | struct vsp1_uds *uds[VPS1_MAX_UDS]; | 60 | struct vsp1_uds *uds[VSP1_MAX_UDS]; |
61 | struct vsp1_rwpf *wpf[VPS1_MAX_WPF]; | 61 | struct vsp1_rwpf *wpf[VSP1_MAX_WPF]; |
62 | 62 | ||
63 | struct list_head entities; | 63 | struct list_head entities; |
64 | 64 | ||
diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c index c69ee0657f75..0c5e74cdd3d0 100644 --- a/drivers/media/platform/vsp1/vsp1_drv.c +++ b/drivers/media/platform/vsp1/vsp1_drv.c | |||
@@ -440,19 +440,19 @@ static int vsp1_validate_platform_data(struct platform_device *pdev, | |||
440 | return -EINVAL; | 440 | return -EINVAL; |
441 | } | 441 | } |
442 | 442 | ||
443 | if (pdata->rpf_count <= 0 || pdata->rpf_count > VPS1_MAX_RPF) { | 443 | if (pdata->rpf_count <= 0 || pdata->rpf_count > VSP1_MAX_RPF) { |
444 | dev_err(&pdev->dev, "invalid number of RPF (%u)\n", | 444 | dev_err(&pdev->dev, "invalid number of RPF (%u)\n", |
445 | pdata->rpf_count); | 445 | pdata->rpf_count); |
446 | return -EINVAL; | 446 | return -EINVAL; |
447 | } | 447 | } |
448 | 448 | ||
449 | if (pdata->uds_count <= 0 || pdata->uds_count > VPS1_MAX_UDS) { | 449 | if (pdata->uds_count <= 0 || pdata->uds_count > VSP1_MAX_UDS) { |
450 | dev_err(&pdev->dev, "invalid number of UDS (%u)\n", | 450 | dev_err(&pdev->dev, "invalid number of UDS (%u)\n", |
451 | pdata->uds_count); | 451 | pdata->uds_count); |
452 | return -EINVAL; | 452 | return -EINVAL; |
453 | } | 453 | } |
454 | 454 | ||
455 | if (pdata->wpf_count <= 0 || pdata->wpf_count > VPS1_MAX_WPF) { | 455 | if (pdata->wpf_count <= 0 || pdata->wpf_count > VSP1_MAX_WPF) { |
456 | dev_err(&pdev->dev, "invalid number of WPF (%u)\n", | 456 | dev_err(&pdev->dev, "invalid number of WPF (%u)\n", |
457 | pdata->wpf_count); | 457 | pdata->wpf_count); |
458 | return -EINVAL; | 458 | return -EINVAL; |
diff --git a/drivers/media/platform/vsp1/vsp1_video.h b/drivers/media/platform/vsp1/vsp1_video.h index 7284320d5433..cb5d9ef6a311 100644 --- a/drivers/media/platform/vsp1/vsp1_video.h +++ b/drivers/media/platform/vsp1/vsp1_video.h | |||
@@ -73,7 +73,7 @@ struct vsp1_pipeline { | |||
73 | 73 | ||
74 | unsigned int num_video; | 74 | unsigned int num_video; |
75 | unsigned int num_inputs; | 75 | unsigned int num_inputs; |
76 | struct vsp1_rwpf *inputs[VPS1_MAX_RPF]; | 76 | struct vsp1_rwpf *inputs[VSP1_MAX_RPF]; |
77 | struct vsp1_rwpf *output; | 77 | struct vsp1_rwpf *output; |
78 | struct vsp1_entity *bru; | 78 | struct vsp1_entity *bru; |
79 | struct vsp1_entity *lif; | 79 | struct vsp1_entity *lif; |