[media] em28xx: move norm_maxw() and norm_maxh() from em28xx.h to em28xx-video.c

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 4f66bd360c3c5bdb92653e3bf6052926b2d8b5e3..9090a460f51d21c5e13c79e47e80098639aad565 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -141,6 +141,29 @@ static struct em28xx_fmt format[] = {
        },
 };
 
+/*FIXME: maxw should be dependent of alt mode */
+static inline unsigned int norm_maxw(struct em28xx *dev)
+{
+       if (dev->board.is_webcam)
+               return dev->sensor_xres;
+
+       if (dev->board.max_range_640_480)
+               return 640;
+
+       return 720;
+}
+
+static inline unsigned int norm_maxh(struct em28xx *dev)
+{
+       if (dev->board.is_webcam)
+               return dev->sensor_yres;
+
+       if (dev->board.max_range_640_480)
+               return 480;
+
+       return (dev->norm & V4L2_STD_625_50) ? 576 : 480;
+}
+
 static int em28xx_vbi_supported(struct em28xx *dev)
 {
        /* Modprobe option to manually disable */

diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 191d05bef6a9acc62c4b6ed08d5c0040ef2b6093..6c0978f9fe617182327a700707a3bf63912d3d72 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -794,26 +794,4 @@ int em28xx_init_camera(struct em28xx *dev);
        printk(KERN_WARNING "%s: "fmt,\
                        dev->name , ##arg); } while (0)
 
-/*FIXME: maxw should be dependent of alt mode */
-static inline unsigned int norm_maxw(struct em28xx *dev)
-{
-       if (dev->board.is_webcam)
-               return dev->sensor_xres;
-
-       if (dev->board.max_range_640_480)
-               return 640;
-
-       return 720;
-}
-
-static inline unsigned int norm_maxh(struct em28xx *dev)
-{
-       if (dev->board.is_webcam)
-               return dev->sensor_yres;
-
-       if (dev->board.max_range_640_480)
-               return 480;
-
-       return (dev->norm & V4L2_STD_625_50) ? 576 : 480;
-}
 #endif