V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16

... and cleanup any drivers using them.
I've also removed NBC_QPSK and modified the cx24116 driver to check
the delivery_type also, removing some excess namespace baggage.

Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 7fe9b3fb1e3..7b4b1a5ac42 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1011,9 +1011,9 @@ void dtv_property_adv_params_sync(struct dvb_frontend *fe)
         p->inversion = c->inversion;
 
         switch(c->modulation) {
-        case _8PSK:
-        case _16APSK:
-        case NBC_QPSK:
+        case PSK_8:
+        case APSK_16:
+        case QPSK:
                 p->u.qpsk.symbol_rate = c->symbol_rate;
                 p->u.qpsk.fec_inner = c->fec_inner;
                 break;