V4L/DVB (9980): em28xx: simplify analog logic

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / em28xx / em28xx-video.c

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 4c0986920970b05a49068cbf832f9f46e35407f9..4a548fbd79d39528a075e97f32bee51cfd9bdf5c 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1950,8 +1950,10 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
        return vfd;
 }
 
-int em28xx_analog_config(struct em28xx *dev)
+int em28xx_register_analog_devices(struct em28xx *dev)
 {
+       int ret;
+
        printk(KERN_INFO "%s: v4l2 driver version %d.%d.%d\n",
                dev->name,
                (EM28XX_VERSION_CODE >> 16) & 0xff,
@@ -1985,13 +1987,6 @@ int em28xx_analog_config(struct em28xx *dev)
        /* FIXME: This is a very bad hack! Not all devices have TV on input 2 */
        dev->ctl_input = 2;
 
-       return 0;
-}
-
-int em28xx_register_analog_devices(struct em28xx *dev)
-{
-       int ret;
-
        /* allocate and fill video video_device struct */
        dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video");
        if (!dev->vdev) {