* [PATCH 1/2] [media] au0828: get rid of AU0828_VMUX_DEBUG
@ 2016-02-12 11:21 Mauro Carvalho Chehab
2016-02-12 11:21 ` [PATCH 2/2] [media] cx231xx: get rid of CX231XX_VMUX_DEBUG Mauro Carvalho Chehab
2016-02-12 12:16 ` [PATCH 1/2] [media] au0828: get rid of AU0828_VMUX_DEBUG Hans Verkuil
0 siblings, 2 replies; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2016-02-12 11:21 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List,
Mauro Carvalho Chehab, Hans Verkuil, Junghak Sung, Seung-Woo Kim,
Inki Dae, Shuah Khan, Markus Elfring,
Rafael Lourenço de Lima Chehab, Lad, Prabhakar,
Geunyoung Kim
This is not used on the driver. remove it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---
drivers/media/usb/au0828/au0828-video.c | 12 +++---------
drivers/media/usb/au0828/au0828.h | 1 -
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index 4164302dd8ac..2fc2b29d2dd9 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -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:
@@ -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)
@@ -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__,
@@ -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;
@@ -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]);
diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h
index 19fd6a841988..23f869cf11da 100644
--- a/drivers/media/usb/au0828/au0828.h
+++ b/drivers/media/usb/au0828/au0828.h
@@ -76,7 +76,6 @@ enum au0828_itype {
AU0828_VMUX_CABLE,
AU0828_VMUX_TELEVISION,
AU0828_VMUX_DVB,
- AU0828_VMUX_DEBUG
};
struct au0828_input {
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] [media] cx231xx: get rid of CX231XX_VMUX_DEBUG
2016-02-12 11:21 [PATCH 1/2] [media] au0828: get rid of AU0828_VMUX_DEBUG Mauro Carvalho Chehab
@ 2016-02-12 11:21 ` Mauro Carvalho Chehab
2016-02-12 12:16 ` Hans Verkuil
2016-02-12 12:16 ` [PATCH 1/2] [media] au0828: get rid of AU0828_VMUX_DEBUG Hans Verkuil
1 sibling, 1 reply; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2016-02-12 11:21 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List,
Mauro Carvalho Chehab, Hans Verkuil, Lad, Prabhakar, Sakari Ailus,
Scott Jiang, Steven Rostedt, Andrzej Hajda, Arnd Bergmann,
Tommi Rantala, Olli Salonen
This macro is not used inside the driver. get rid of it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---
drivers/media/usb/cx231xx/cx231xx-video.c | 3 +--
drivers/media/usb/cx231xx/cx231xx.h | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index 7222b1c27d40..6414188ffdfa 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -1103,7 +1103,6 @@ static const char *iname[] = {
[CX231XX_VMUX_TELEVISION] = "Television",
[CX231XX_VMUX_CABLE] = "Cable TV",
[CX231XX_VMUX_DVB] = "DVB",
- [CX231XX_VMUX_DEBUG] = "for debug only",
};
void cx231xx_v4l2_create_entities(struct cx231xx *dev)
@@ -1136,7 +1135,7 @@ void cx231xx_v4l2_create_entities(struct cx231xx *dev)
if (dev->tuner_type == TUNER_ABSENT)
continue;
/* fall though */
- default: /* CX231XX_VMUX_DEBUG */
+ default: /* just to shut up a gcc warning */
ent->function = MEDIA_ENT_F_CONN_RF;
break;
}
diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index 60e14776a6cd..69f6d20870f5 100644
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -281,7 +281,6 @@ enum cx231xx_itype {
CX231XX_VMUX_CABLE,
CX231XX_RADIO,
CX231XX_VMUX_DVB,
- CX231XX_VMUX_DEBUG
};
enum cx231xx_v_input {
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] [media] cx231xx: get rid of CX231XX_VMUX_DEBUG
2016-02-12 11:21 ` [PATCH 2/2] [media] cx231xx: get rid of CX231XX_VMUX_DEBUG Mauro Carvalho Chehab
@ 2016-02-12 12:16 ` Hans Verkuil
0 siblings, 0 replies; 4+ messages in thread
From: Hans Verkuil @ 2016-02-12 12:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab,
no To-header on input <""@pop.xs4all.nl>
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, Hans Verkuil,
Lad, Prabhakar, Sakari Ailus, Scott Jiang, Steven Rostedt,
Andrzej Hajda, Arnd Bergmann, Tommi Rantala, Olli Salonen
On 02/12/2016 12:21 PM, Mauro Carvalho Chehab wrote:
> This macro is not used inside the driver. get rid of it.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> ---
> drivers/media/usb/cx231xx/cx231xx-video.c | 3 +--
> drivers/media/usb/cx231xx/cx231xx.h | 1 -
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
> index 7222b1c27d40..6414188ffdfa 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-video.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-video.c
> @@ -1103,7 +1103,6 @@ static const char *iname[] = {
> [CX231XX_VMUX_TELEVISION] = "Television",
> [CX231XX_VMUX_CABLE] = "Cable TV",
> [CX231XX_VMUX_DVB] = "DVB",
> - [CX231XX_VMUX_DEBUG] = "for debug only",
> };
>
> void cx231xx_v4l2_create_entities(struct cx231xx *dev)
> @@ -1136,7 +1135,7 @@ void cx231xx_v4l2_create_entities(struct cx231xx *dev)
> if (dev->tuner_type == TUNER_ABSENT)
> continue;
> /* fall though */
> - default: /* CX231XX_VMUX_DEBUG */
> + default: /* just to shut up a gcc warning */
> ent->function = MEDIA_ENT_F_CONN_RF;
> break;
> }
> diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
> index 60e14776a6cd..69f6d20870f5 100644
> --- a/drivers/media/usb/cx231xx/cx231xx.h
> +++ b/drivers/media/usb/cx231xx/cx231xx.h
> @@ -281,7 +281,6 @@ enum cx231xx_itype {
> CX231XX_VMUX_CABLE,
> CX231XX_RADIO,
> CX231XX_VMUX_DVB,
> - CX231XX_VMUX_DEBUG
> };
>
> enum cx231xx_v_input {
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] [media] au0828: get rid of AU0828_VMUX_DEBUG
2016-02-12 11:21 [PATCH 1/2] [media] au0828: get rid of AU0828_VMUX_DEBUG Mauro Carvalho Chehab
2016-02-12 11:21 ` [PATCH 2/2] [media] cx231xx: get rid of CX231XX_VMUX_DEBUG Mauro Carvalho Chehab
@ 2016-02-12 12:16 ` Hans Verkuil
1 sibling, 0 replies; 4+ messages in thread
From: Hans Verkuil @ 2016-02-12 12:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab,
no To-header on input <""@pop.xs4all.nl>
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, Hans Verkuil,
Junghak Sung, Seung-Woo Kim, Inki Dae, Shuah Khan, Markus Elfring,
Rafael Lourenço de Lima Chehab, Lad, Prabhakar,
Geunyoung Kim
On 02/12/2016 12:21 PM, Mauro Carvalho Chehab wrote:
> This is not used on the driver. remove it.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> ---
> drivers/media/usb/au0828/au0828-video.c | 12 +++---------
> drivers/media/usb/au0828/au0828.h | 1 -
> 2 files changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
> index 4164302dd8ac..2fc2b29d2dd9 100644
> --- a/drivers/media/usb/au0828/au0828-video.c
> +++ b/drivers/media/usb/au0828/au0828-video.c
> @@ -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:
> @@ -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)
> @@ -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__,
> @@ -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;
>
> @@ -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]);
> diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h
> index 19fd6a841988..23f869cf11da 100644
> --- a/drivers/media/usb/au0828/au0828.h
> +++ b/drivers/media/usb/au0828/au0828.h
> @@ -76,7 +76,6 @@ enum au0828_itype {
> AU0828_VMUX_CABLE,
> AU0828_VMUX_TELEVISION,
> AU0828_VMUX_DVB,
> - AU0828_VMUX_DEBUG
> };
>
> struct au0828_input {
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-02-12 12:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-12 11:21 [PATCH 1/2] [media] au0828: get rid of AU0828_VMUX_DEBUG Mauro Carvalho Chehab
2016-02-12 11:21 ` [PATCH 2/2] [media] cx231xx: get rid of CX231XX_VMUX_DEBUG Mauro Carvalho Chehab
2016-02-12 12:16 ` Hans Verkuil
2016-02-12 12:16 ` [PATCH 1/2] [media] au0828: get rid of AU0828_VMUX_DEBUG Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox