summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/cx231xx
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-22 11:42:04 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-23 07:18:45 -0300
commit41b44e35ba9b34e50a65c05ecf7642c07bd3e8aa (patch)
tree32743771d16d1b18d305600dc66d0f4828fecbde /drivers/media/usb/cx231xx
parent2ddf22eec4b88ab0d4235a140db8243eaaab5128 (diff)
downloadblackbird-op-linux-41b44e35ba9b34e50a65c05ecf7642c07bd3e8aa.tar.gz
blackbird-op-linux-41b44e35ba9b34e50a65c05ecf7642c07bd3e8aa.zip
[media] media-device: move PCI/USB helper functions from v4l2-mc
Those ancillary functions could be called even when compiled without V4L2 support, as warned by ktest build robot: All errors (new ones prefixed by >>): >> ERROR: "__v4l2_mc_usb_media_device_init" [drivers/media/usb/dvb-usb/dvb-usb.ko] undefined! >> ERROR: "__v4l2_mc_usb_media_device_init" [drivers/media/usb/dvb-usb-v2/dvb_usb_v2.ko] undefined! >> ERROR: "__v4l2_mc_usb_media_device_init" [drivers/media/usb/au0828/au0828.ko] undefined! Also, there's nothing there that are specific to V4L2. So, move those ancillary functions to MC core. No functional changes. Just function rename. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/cx231xx')
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-cards.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 9e3a5d2038c2..29bd7536feed 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -1212,7 +1212,7 @@ static int cx231xx_media_device_init(struct cx231xx *dev,
#ifdef CONFIG_MEDIA_CONTROLLER
struct media_device *mdev;
- mdev = v4l2_mc_usb_media_device_init(udev, dev->board.name);
+ mdev = media_device_usb_init(udev, dev->board.name);
if (!mdev)
return -ENOMEM;
OpenPOWER on IntegriCloud