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

Commit 0820eb5c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] dvbdev: remove two dead functions if !CONFIG_MEDIA_CONTROLLER_DVB 



Those functions are used only if CONFIG_MEDIA_CONTROLLER_DVB.
Without that, if !CONFIG_MEDIA_CONTROLLER_DVB, it would produce
two warnings:

drivers/media/dvb-core/dvbdev.c:219:12: warning: 'dvb_create_tsout_entity' defined but not used [-Wunused-function]
 static int dvb_create_tsout_entity(struct dvb_device *dvbdev,
            ^
drivers/media/dvb-core/dvbdev.c:264:12: warning: 'dvb_create_media_entity' defined but not used [-Wunused-function]
 static int dvb_create_media_entity(struct dvb_device *dvbdev,
            ^

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

drivers/media/dvb-core/dvbdev.c

+2 −4
Original line number Diff line number Diff line
@@ -216,10 +216,10 @@ static void dvb_media_device_free(struct dvb_device *dvbdev) 
#endif

}



#if defined(CONFIG_MEDIA_CONTROLLER_DVB)

static int dvb_create_tsout_entity(struct dvb_device *dvbdev,

				    const char *name, int npads)

{

#if defined(CONFIG_MEDIA_CONTROLLER_DVB)

	int i, ret = 0;



	dvbdev->tsout_pads = kcalloc(npads, sizeof(*dvbdev->tsout_pads),
@@ -254,7 +254,6 @@ static int dvb_create_tsout_entity(struct dvb_device *dvbdev, 
		if (ret < 0)

			return ret;

	}

#endif

	return 0;

}
@@ -264,7 +263,6 @@ static int dvb_create_tsout_entity(struct dvb_device *dvbdev, 
static int dvb_create_media_entity(struct dvb_device *dvbdev,

				   int type, int demux_sink_pads)

{

#if defined(CONFIG_MEDIA_CONTROLLER_DVB)

	int i, ret, npads;



	switch (type) {
@@ -352,9 +350,9 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev, 
	printk(KERN_DEBUG "%s: media entity '%s' registered.\n",

		__func__, dvbdev->entity->name);



#endif

	return 0;

}

#endif



static int dvb_register_media_device(struct dvb_device *dvbdev,

				     int type, int minor,