diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-22 15:42:04 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-23 11:18:45 +0100 |
| commit | 41b44e35ba9b34e50a65c05ecf7642c07bd3e8aa (patch) | |
| tree | 32743771d16d1b18d305600dc66d0f4828fecbde /drivers/media/usb/em28xx | |
| parent | [media] media: ti-vpe: cal: Fix warning: variable dereference before being ch... (diff) | |
| download | linux-41b44e35ba9b34e50a65c05ecf7642c07bd3e8aa.tar.xz 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/em28xx')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index 389e95fb0211..0bae26325253 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -3020,11 +3020,11 @@ static int em28xx_media_device_init(struct em28xx *dev, struct media_device *mdev; if (udev->product) { - mdev = v4l2_mc_usb_media_device_init(udev, udev->product); + mdev = media_device_usb_init(udev, udev->product); } else if (udev->manufacturer) { - mdev = v4l2_mc_usb_media_device_init(udev, udev->manufacturer); + mdev = media_device_usb_init(udev, udev->manufacturer); } else { - mdev = v4l2_mc_usb_media_device_init(udev, dev->name); + mdev = media_device_usb_init(udev, dev->name); } if (!mdev) |