V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation

This means that when developers add new commands then they'll be see
the DTV_MAX_COMMAND define and will be more likely to modify it, without
having to modify the command validation code.

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

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index ff8cda0..7fe9b3f 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -848,8 +848,7 @@ void dtv_property_dump(struct dtv_property *tvp)
 {
        int i;
 
-       if( (tvp->cmd <= 0 || tvp->cmd > DTV_DELIVERY_SYSTEM) &&
-                       tvp->cmd != DTV_API_VERSION) {
+       if (tvp->cmd <= 0 || tvp->cmd > DTV_MAX_COMMAND) {
                printk("%s: tvp.cmd = 0x%08x (undefined/unknown/invalid)\n",
                        __func__, tvp->cmd);
                return;

diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index eb98f8c..1cfcd1a 100644 (file)
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -270,6 +270,8 @@ struct dvb_frontend_event {
 
 #define DTV_API_VERSION                                35
 
+#define DTV_MAX_COMMAND                                DTV_API_VERSION
+
 typedef enum fe_pilot {
        PILOT_ON,
        PILOT_OFF,