Commit d83a96a5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] em28xx: remove unused input types

The em28xx driver have lots of different input types but
only 4 of such types are actually used. The others are bogus.

Remove them, in order to cleanup the driver.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent e545ac87
This diff is collapsed.
...@@ -1442,16 +1442,11 @@ static int vidioc_s_parm(struct file *file, void *priv, ...@@ -1442,16 +1442,11 @@ static int vidioc_s_parm(struct file *file, void *priv,
0, video, s_parm, p); 0, video, s_parm, p);
} }
static const char *iname[] = { static const char * const iname[] = {
[EM28XX_VMUX_COMPOSITE1] = "Composite1", [EM28XX_VMUX_COMPOSITE] = "Composite",
[EM28XX_VMUX_COMPOSITE2] = "Composite2", [EM28XX_VMUX_SVIDEO] = "S-Video",
[EM28XX_VMUX_COMPOSITE3] = "Composite3",
[EM28XX_VMUX_COMPOSITE4] = "Composite4",
[EM28XX_VMUX_SVIDEO] = "S-Video",
[EM28XX_VMUX_TELEVISION] = "Television", [EM28XX_VMUX_TELEVISION] = "Television",
[EM28XX_VMUX_CABLE] = "Cable TV", [EM28XX_RADIO] = "Radio",
[EM28XX_VMUX_DVB] = "DVB",
[EM28XX_VMUX_DEBUG] = "for debug only",
}; };
static int vidioc_enum_input(struct file *file, void *priv, static int vidioc_enum_input(struct file *file, void *priv,
...@@ -1471,8 +1466,7 @@ static int vidioc_enum_input(struct file *file, void *priv, ...@@ -1471,8 +1466,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
strcpy(i->name, iname[INPUT(n)->type]); strcpy(i->name, iname[INPUT(n)->type]);
if ((EM28XX_VMUX_TELEVISION == INPUT(n)->type) || if ((EM28XX_VMUX_TELEVISION == INPUT(n)->type))
(EM28XX_VMUX_CABLE == INPUT(n)->type))
i->type = V4L2_INPUT_TYPE_TUNER; i->type = V4L2_INPUT_TYPE_TUNER;
i->std = dev->v4l2->vdev.tvnorms; i->std = dev->v4l2->vdev.tvnorms;
......
...@@ -291,15 +291,9 @@ struct em28xx_dmaqueue { ...@@ -291,15 +291,9 @@ struct em28xx_dmaqueue {
#define MAX_EM28XX_INPUT 4 #define MAX_EM28XX_INPUT 4
enum enum28xx_itype { enum enum28xx_itype {
EM28XX_VMUX_COMPOSITE1 = 1, EM28XX_VMUX_COMPOSITE = 1,
EM28XX_VMUX_COMPOSITE2,
EM28XX_VMUX_COMPOSITE3,
EM28XX_VMUX_COMPOSITE4,
EM28XX_VMUX_SVIDEO, EM28XX_VMUX_SVIDEO,
EM28XX_VMUX_TELEVISION, EM28XX_VMUX_TELEVISION,
EM28XX_VMUX_CABLE,
EM28XX_VMUX_DVB,
EM28XX_VMUX_DEBUG,
EM28XX_RADIO, EM28XX_RADIO,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment