summaryrefslogtreecommitdiff
path: root/drivers/media/usb/au0828/au0828-video.c
diff options
context:
space:
mode:
authorShuah Khan <shuahkh@osg.samsung.com>2016-02-11 21:41:28 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-27 08:45:43 -0300
commit50512333f2d7f09fc108e062278a82d2cbc6581c (patch)
tree1bcebfedff6233b3478491e07d55af4fad12176f /drivers/media/usb/au0828/au0828-video.c
parent82410a98bd03d08dbe580f8d2c870c70de8e023e (diff)
[media] media: au0828 Use au8522_media_pads enum for pad defines
Change au0828-core to use au8522_media_pads enum defines instead of hard-coding the pad values. [mchehab@osg.samsung.com: patch rebased, as the code was moved to au0828-video.c. Also added AU8522_PAD_INPUT to the list of pad number replacements] Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/au0828/au0828-video.c')
-rw-r--r--drivers/media/usb/au0828/au0828-video.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index 2fc2b29d2dd9..fb61b5c6b7d1 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -28,6 +28,7 @@
*/
#include "au0828.h"
+#include "au8522.h"
#include <linux/module.h>
#include <linux/slab.h>
@@ -681,16 +682,18 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
if (tuner) {
ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT,
- decoder, 0,
+ decoder, AU8522_PAD_INPUT,
MEDIA_LNK_FL_ENABLED);
if (ret)
return ret;
}
- ret = media_create_pad_link(decoder, 1, &dev->vdev.entity, 0,
+ ret = media_create_pad_link(decoder, AU8522_PAD_VID_OUT,
+ &dev->vdev.entity, 0,
MEDIA_LNK_FL_ENABLED);
if (ret)
return ret;
- ret = media_create_pad_link(decoder, 2, &dev->vbi_dev.entity, 0,
+ ret = media_create_pad_link(decoder, AU8522_PAD_VBI_OUT,
+ &dev->vbi_dev.entity, 0,
MEDIA_LNK_FL_ENABLED);
if (ret)
return ret;
@@ -716,7 +719,8 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
case AU0828_VMUX_COMPOSITE:
case AU0828_VMUX_SVIDEO:
/* FIXME: fix the decoder PAD */
- ret = media_create_pad_link(ent, 0, decoder, 0, 0);
+ ret = media_create_pad_link(ent, 0, decoder,
+ AU8522_PAD_INPUT, 0);
if (ret)
return ret;
break;