summaryrefslogtreecommitdiff
path: root/drivers/media/usb/siano
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/siano
parent2ddf22eec4b88ab0d4235a140db8243eaaab5128 (diff)
[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/siano')
-rw-r--r--drivers/media/usb/siano/smsusb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index 4dac499ed28e..4a0def1e1528 100644
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <linux/firmware.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <media/v4l2-mc.h>
+#include <media/media-device.h>
#include "sms-cards.h"
#include "smsendian.h"
@@ -367,7 +367,7 @@ static void *siano_media_device_register(struct smsusb_device_t *dev,
struct sms_board *board = sms_get_board(board_id);
int ret;
- mdev = v4l2_mc_usb_media_device_init(udev, board->name);
+ mdev = media_device_usb_init(udev, board->name);
if (!mdev)
return NULL;