V4L/DVB (6793): Convert saa7134-empress to video_ioctl2

saa7134 were converted to video_ioctl2, but saa7134_empress weren't. This broke
saa7134-empress, since it were dependent of saa7134_common_ioctl.

With the conversion, the module had a size decrease of 436 bytes on x86_64:

   text    data     bss     dec     hex filename
   5196    4912       4   10112    2780 old/saa7134-empress.ko
   4760    4912       4    9676    25cc new/saa7134-empress.ko

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 6a29b75beaa6..9705f1f39509 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -217,12 +217,6 @@ static struct saa7134_format formats[] = {
                 .vbi_v_start_1 = 273,   \
                 .src_timing    = 7
 
-#define SAA7134_NORMS   \
-                V4L2_STD_PAL    | V4L2_STD_PAL_N | \
-                V4L2_STD_PAL_Nc | V4L2_STD_SECAM | \
-                V4L2_STD_NTSC   | V4L2_STD_PAL_M | \
-                V4L2_STD_PAL_60
-
 static struct saa7134_tvnorm tvnorms[] = {
         {
                 .name          = "PAL", /* autodetect */
@@ -1123,8 +1117,7 @@ static struct videobuf_queue_ops video_qops = {
 
 /* ------------------------------------------------------------------ */
 
-static int saa7134_g_ctrl(struct file *file, void *priv,
-                                        struct v4l2_control *c)
+int saa7134_g_ctrl(struct file *file, void *priv, struct v4l2_control *c)
 {
         struct saa7134_fh *fh = priv;
         struct saa7134_dev *dev = fh->dev;
@@ -1173,8 +1166,7 @@ static int saa7134_g_ctrl(struct file *file, void *priv,
         return 0;
 }
 
-static int saa7134_s_ctrl(struct file *file, void *f,
-                                        struct v4l2_control *c)
+int saa7134_s_ctrl(struct file *file, void *f, struct v4l2_control *c)
 {
         const struct v4l2_queryctrl* ctrl;
         struct saa7134_fh *fh = f;
@@ -1680,8 +1672,7 @@ static int saa7134_s_fmt_overlay(struct file *file, void *priv,
         return 0;
 }
 
-static int saa7134_queryctrl(struct file *file, void *priv,
-                                        struct v4l2_queryctrl *c)
+int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c)
 {
         const struct v4l2_queryctrl *ctrl;