]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] stv090x: Fix some compilation warnings
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 27 Dec 2010 15:16:47 +0000 (12:16 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 29 Dec 2010 10:17:14 +0000 (08:17 -0200)
A few typos at the driver are causing the following warnings:

drivers/media/dvb/frontends/stv090x.c: In function ‘stv090x_start_search’:
drivers/media/dvb/frontends/stv090x.c:1486:27: warning: comparison between ‘enum stv090x_search’ and ‘enum stv090x_delsys’
drivers/media/dvb/frontends/stv090x.c:1487:24: warning: comparison between ‘enum stv090x_search’ and ‘enum stv090x_delsys’
drivers/media/dvb/frontends/stv090x.c: In function ‘stv090x_optimize_track’:
drivers/media/dvb/frontends/stv090x.c:2943:2: warning: case value ‘4’ not in enumerated type ‘enum stv090x_delsys’

The first two are due to the lack of using the delsys types
STV090x_DVBS1/STV090x_DSS
instead of
STV090x_SEARCH_DVBS1/STV090x_SEARCH_DSS

The second one is due to the usage of STV090x_UNKNOWN (enum stv090x_modulation)
instead of STV090x_ERROR (enum stv090x_delsys).

Cc: Manu Abraham <abraham.manu@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/frontends/stv090x.c

index 425e7a43ae19ea8d3ecb8da3eb776d71304050f6..4e0fc2c8a41c24eeabd940e8e79547547d1f6163 100644 (file)
@@ -1483,8 +1483,8 @@ static int stv090x_start_search(struct stv090x_state *state)
                if (STV090x_WRITE_DEMOD(state, FFECFG, 0x41) < 0)
                        goto err;
 
-               if ((state->search_mode == STV090x_DVBS1)       ||
-                       (state->search_mode == STV090x_DSS)     ||
+               if ((state->search_mode == STV090x_SEARCH_DVBS1)        ||
+                       (state->search_mode == STV090x_SEARCH_DSS)      ||
                        (state->search_mode == STV090x_SEARCH_AUTO)) {
 
                        if (STV090x_WRITE_DEMOD(state, VITSCALE, 0x82) < 0)
@@ -2940,7 +2940,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
                STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x67); /* PER */
                break;
 
-       case STV090x_UNKNOWN:
+       case STV090x_ERROR:
        default:
                reg = STV090x_READ_DEMOD(state, DMDCFGMD);
                STV090x_SETFIELD_Px(reg, DVBS1_ENABLE_FIELD, 1);