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

Commit 89a2c1d6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] use a function for DVB media controller register 



This is really a simple function, but using it avoids to have
if's inside the drivers.

Also, the kABI becomes a little more clearer.

This shouldn't generate any overhead, and the type check
will happen when compiling with MC DVB enabled.

So, let's do it.

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

drivers/media/common/siano/smsdvb-main.c

+1 −3
Original line number Diff line number Diff line
@@ -1104,9 +1104,7 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev, 
		pr_err("dvb_register_adapter() failed %d\n", rc);

		goto adapter_error;

	}

#ifdef CONFIG_MEDIA_CONTROLLER_DVB

	client->adapter.mdev = coredev->media_dev;

#endif

	dvb_register_media_controller(&client->adapter, coredev->media_dev);



	/* init dvb demux */

	client->demux.dmx.capabilities = DMX_TS_FILTERING;

drivers/media/dvb-core/dvbdev.h

+7 −0
Original line number Diff line number Diff line
@@ -125,8 +125,15 @@ extern void dvb_unregister_device (struct dvb_device *dvbdev); 


#ifdef CONFIG_MEDIA_CONTROLLER_DVB

void dvb_create_media_graph(struct dvb_adapter *adap);

static inline void dvb_register_media_controller(struct dvb_adapter *adap,

						 struct media_device *mdev)

{

	adap->mdev = mdev;

}



#else

static inline void dvb_create_media_graph(struct dvb_adapter *adap) {}

#define dvb_register_media_controller(a, b) {}

#endif



extern int dvb_generic_open (struct inode *inode, struct file *file);

drivers/media/usb/cx231xx/cx231xx-dvb.c

+1 −3
Original line number Diff line number Diff line
@@ -465,9 +465,7 @@ static int register_dvb(struct cx231xx_dvb *dvb, 
		       dev->name, result);

		goto fail_adapter;

	}

#ifdef CONFIG_MEDIA_CONTROLLER_DVB

	dvb->adapter.mdev = dev->media_dev;

#endif

	dvb_register_media_controller(&dvb->adapter, dev->media_dev);



	/* Ensure all frontends negotiate bus access */

	dvb->frontend->ops.ts_bus_ctrl = cx231xx_dvb_bus_ctrl;

drivers/media/usb/dvb-usb-v2/dvb_usb_core.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static void dvb_usbv2_media_device_register(struct dvb_usb_adapter *adap) 
		return;

	}



	adap->dvb_adap.mdev = mdev;

	dvb_register_media_controller(&adap->dvb_adap, mdev);



	dev_info(&d->udev->dev, "media controller created\n");

drivers/media/usb/dvb-usb/dvb-usb-dvb.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void dvb_usb_media_device_register(struct dvb_usb_adapter *adap) 
		kfree(mdev);

		return;

	}

	adap->dvb_adap.mdev = mdev;

	dvb_register_media_controller(&adap->dvb_adap, mdev);



	dev_info(&d->udev->dev, "media controller created\n");

#endif