Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9822f417 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] au0828: use v4l2_mc_create_media_graph() 



There's no reason to implement its own function to create the
media graph. So, use the core one.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent bddc4187

drivers/media/usb/au0828/au0828-video.c

+5 −98
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/init.h>

#include <linux/device.h>

#include <media/v4l2-common.h>

#include <media/v4l2-mc.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-event.h>

#include <media/tuner.h>
@@ -652,102 +653,6 @@ void au0828_usb_v4l2_media_release(struct au0828_dev *dev) 
#endif

}



static int au0828_create_media_graph(struct au0828_dev *dev)

{

#ifdef CONFIG_MEDIA_CONTROLLER

	struct media_device *mdev = dev->media_dev;

	struct media_entity *entity;

	struct media_entity *tuner = NULL, *decoder = NULL, *demod = NULL;

	int i, ret;



	if (!mdev)

		return 0;



	media_device_for_each_entity(entity, mdev) {

		switch (entity->function) {

		case MEDIA_ENT_F_TUNER:

			tuner = entity;

			break;

		case MEDIA_ENT_F_ATV_DECODER:

			decoder = entity;

			break;

		case MEDIA_ENT_F_DTV_DEMOD:

			demod = entity;

			break;

		}

	}



	/* Analog setup, using tuner as a link */



	/* Something bad happened! */

	if (!decoder)

		return -EINVAL;



	if (tuner) {

		dev->tuner = tuner;

		ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT,

					    decoder, DEMOD_PAD_IF_INPUT, 0);

		if (ret)

			return ret;

	}

	ret = media_create_pad_link(decoder, DEMOD_PAD_VID_OUT,

				    &dev->vdev.entity, 0,

				    MEDIA_LNK_FL_ENABLED);

	if (ret)

		return ret;

	ret = media_create_pad_link(decoder, DEMOD_PAD_VBI_OUT,

				    &dev->vbi_dev.entity, 0,

				    MEDIA_LNK_FL_ENABLED);

	if (ret)

		return ret;



	for (i = 0; i < AU0828_MAX_INPUT; i++) {

		struct media_entity *ent = &dev->input_ent[i];



		switch (AUVI_INPUT(i).type) {

		case AU0828_VMUX_UNDEFINED:

			break;

		case AU0828_VMUX_CABLE:

		case AU0828_VMUX_TELEVISION:

		case AU0828_VMUX_DVB:

			if (!tuner)

				break;



			ret = media_create_pad_link(ent, 0, tuner,

						    TUNER_PAD_RF_INPUT,

						    MEDIA_LNK_FL_ENABLED);

			if (ret)

				return ret;

			break;

		case AU0828_VMUX_COMPOSITE:

		case AU0828_VMUX_SVIDEO:

			/* FIXME: fix the decoder PAD */

			ret = media_create_pad_link(ent, 0, decoder,

						    DEMOD_PAD_IF_INPUT, 0);

			if (ret)

				return ret;

			break;

		}

	}



	/*

	 * Disable tuner to demod link to avoid disable step

	 * when tuner is requested by video or audio

	*/

	if (tuner && demod) {

		struct media_link *link;



		list_for_each_entry(link, &demod->links, list) {

			if (link->sink->entity == demod &&

			    link->source->entity == tuner) {

				media_entity_setup_link(link, 0);

			}

		}

	}

#endif

	return 0;

}



static void au0828_usb_v4l2_release(struct v4l2_device *v4l2_dev)

{

	struct au0828_dev *dev =
@@ -2120,14 +2025,16 @@ int au0828_analog_register(struct au0828_dev *dev, 
		ret = -ENODEV;

		goto err_reg_vbi_dev;

	}

	retval = au0828_create_media_graph(dev);



#ifdef CONFIG_MEDIA_CONTROLLER

	retval = v4l2_mc_create_media_graph(dev->media_dev);

	if (retval) {

		pr_err("%s() au0282_dev_register failed to create graph\n",

			__func__);

		ret = -ENODEV;

		goto err_reg_vbi_dev;

	}



#endif



	dprintk(1, "%s completed!\n", __func__);

drivers/media/v4l2-core/v4l2-mc.c

+20 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ int v4l2_mc_create_media_graph(struct media_device *mdev) 
{

	struct media_entity *entity;

	struct media_entity *if_vid = NULL, *if_aud = NULL;

	struct media_entity *tuner = NULL, *decoder = NULL;

	struct media_entity *tuner = NULL, *decoder = NULL, *dtv_demod = NULL;

	struct media_entity *io_v4l = NULL, *io_vbi = NULL, *io_swradio = NULL;

	bool is_webcam = false;

	u32 flags;
@@ -50,6 +50,9 @@ int v4l2_mc_create_media_graph(struct media_device *mdev) 
		case MEDIA_ENT_F_ATV_DECODER:

			decoder = entity;

			break;

		case MEDIA_ENT_F_DTV_DEMOD:

			dtv_demod = entity;

			break;

		case MEDIA_ENT_F_IO_V4L:

			io_v4l = entity;

			break;
@@ -183,6 +186,22 @@ int v4l2_mc_create_media_graph(struct media_device *mdev) 


		flags = 0;

	}



	/*

	 * Disable tuner to demod link to avoid disable step

	 * when tuner is requested by video or audio

	 */

	if (tuner && dtv_demod) {

		struct media_link *link;



		list_for_each_entry(link, &dtv_demod->links, list) {

			if (link->sink->entity == dtv_demod &&

			    link->source->entity == tuner) {

				media_entity_setup_link(link, 0);

			}

		}

	}



	return 0;

}

EXPORT_SYMBOL_GPL(v4l2_mc_create_media_graph);