V4L/DVB: tm6000: Use an enum for extension type

In order to better document and be sure that the values are used
at the proper places, convert extension type into an enum and
name it as "type", instead of "id".

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
index 745f8de..de5e78d 100644 (file)
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@ -392,7 +392,7 @@ static int tm6000_audio_fini(struct tm6000_core *dev)
 }
 
 struct tm6000_ops audio_ops = {
-       .id     = TM6000_AUDIO,
+       .type   = TM6000_AUDIO,
        .name   = "TM6000 Audio Extension",
        .init   = tm6000_audio_init,
        .fini   = tm6000_audio_fini,

diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c
index d3529ae..f501edc 100644 (file)
--- a/drivers/staging/tm6000/tm6000-dvb.c
+++ b/drivers/staging/tm6000/tm6000-dvb.c
@@ -432,7 +432,7 @@ static int dvb_fini(struct tm6000_core *dev)
 }
 
 static struct tm6000_ops dvb_ops = {
-       .id     = TM6000_DVB,
+       .type   = TM6000_DVB,
        .name   = "TM6000 dvb Extension",
        .init   = dvb_init,
        .fini   = dvb_fini,

diff --git a/drivers/staging/tm6000/tm6000.h b/drivers/staging/tm6000/tm6000.h
index a1d96d6..8fccf3e 100644 (file)
--- a/drivers/staging/tm6000/tm6000.h
+++ b/drivers/staging/tm6000/tm6000.h
@@ -218,13 +218,15 @@ struct tm6000_core {
        spinlock_t                   slock;
 };
 
-#define TM6000_AUDIO 0x10
-#define TM6000_DVB     0x20
+enum tm6000_ops_type {
+       TM6000_AUDIO = 0x10,
+       TM6000_DVB = 0x20,
+};
 
 struct tm6000_ops {
        struct list_head        next;
        char                    *name;
-       int                     id;
+       enum tm6000_ops_type    type;
        int (*init)(struct tm6000_core *);
        int (*fini)(struct tm6000_core *);
 };