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

[Frank Schäfer]

Signed-off-by: Frank Schäfer <fschaefer....@googlemail.com>
---
 drivers/media/usb/em28xx/em28xx-video.c | 23 +++++++++++++++++++++++
 drivers/media/usb/em28xx/em28xx.h       | 22 ----------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/drivers/media/usb/em28xx/em28xx-video.c 
b/drivers/media/usb/em28xx/em28xx-video.c
index e15ac75..ac499ae 100644
--- 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 dd6190c..4beb1fa 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -793,26 +793,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
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html