Skip to content

Commit

Permalink
[media] au0828: get rid of AU0828_VMUX_DEBUG
Browse files Browse the repository at this point in the history
This is not used on the driver. remove it.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  • Loading branch information
Mauro Carvalho Chehab committed Feb 16, 2016
1 parent 153d41a commit 34ac253
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
12 changes: 3 additions & 9 deletions drivers/media/usb/au0828/au0828-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -698,10 +698,9 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
for (i = 0; i < AU0828_MAX_INPUT; i++) {
struct media_entity *ent = &dev->input_ent[i];

if (AUVI_INPUT(i).type == AU0828_VMUX_UNDEFINED)
break;

switch (AUVI_INPUT(i).type) {
case AU0828_VMUX_UNDEFINED:
break;
case AU0828_VMUX_CABLE:
case AU0828_VMUX_TELEVISION:
case AU0828_VMUX_DVB:
Expand All @@ -716,7 +715,6 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
break;
case AU0828_VMUX_COMPOSITE:
case AU0828_VMUX_SVIDEO:
default: /* AU0828_VMUX_DEBUG */
/* FIXME: fix the decoder PAD */
ret = media_create_pad_link(ent, 0, decoder, 0, 0);
if (ret)
Expand Down Expand Up @@ -1460,7 +1458,6 @@ static int vidioc_enum_input(struct file *file, void *priv,
[AU0828_VMUX_CABLE] = "Cable TV",
[AU0828_VMUX_TELEVISION] = "Television",
[AU0828_VMUX_DVB] = "DVB",
[AU0828_VMUX_DEBUG] = "tv debug"
};

dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
Expand Down Expand Up @@ -1952,7 +1949,6 @@ static void au0828_analog_create_entities(struct au0828_dev *dev)
[AU0828_VMUX_CABLE] = "Cable TV",
[AU0828_VMUX_TELEVISION] = "Television",
[AU0828_VMUX_DVB] = "DVB",
[AU0828_VMUX_DEBUG] = "tv debug"
};
int ret, i;

Expand Down Expand Up @@ -1988,11 +1984,9 @@ static void au0828_analog_create_entities(struct au0828_dev *dev)
case AU0828_VMUX_CABLE:
case AU0828_VMUX_TELEVISION:
case AU0828_VMUX_DVB:
default: /* Just to shut up a warning */
ent->function = MEDIA_ENT_F_CONN_RF;
break;
default: /* AU0828_VMUX_DEBUG */
ent->function = MEDIA_ENT_F_CONN_TEST;
break;
}

ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);
Expand Down
1 change: 0 additions & 1 deletion drivers/media/usb/au0828/au0828.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ enum au0828_itype {
AU0828_VMUX_CABLE,
AU0828_VMUX_TELEVISION,
AU0828_VMUX_DVB,
AU0828_VMUX_DEBUG
};

struct au0828_input {
Expand Down

0 comments on commit 34ac253

Please sign in to comment.