media: dvb_frontend: get rid of property cache's state

In the past, I guess the idea was to use state in order to
allow an autofush logic. However, in the current code, it is
used only for debug messages, on a poor man's solution, as
there's already a debug message to indicate when the properties
got flushed.

So, just get rid of it for good.

Reviewed-by: Shuah Khan <shuahkg@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 9911dd91a84d5746f37cb186fe443cf1c4f7b794..45d0d488dfcbf2c9930f958f67bdcea13306b4ce 100644 (file)
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -934,8 +934,6 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
        memset(c, 0, offsetof(struct dtv_frontend_properties, strength));
        c->delivery_system = delsys;
 
-       c->state = DTV_CLEAR;
-
        dev_dbg(fe->dvb->device, "%s: Clearing cache for delivery system %d\n",
                        __func__, c->delivery_system);
 
@@ -1758,13 +1756,13 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
                dvb_frontend_clear_cache(fe);
                break;
        case DTV_TUNE:
-               /* interpret the cache of data, build either a traditional frontend
-                * tunerequest so we can pass validation in the FE_SET_FRONTEND
-                * ioctl.
+               /*
+                * Use the cached Digital TV properties to tune the
+                * frontend
                 */
-               c->state = tvp->cmd;
-               dev_dbg(fe->dvb->device, "%s: Finalised property cache\n",
-                               __func__);
+               dev_dbg(fe->dvb->device,
+                       "%s: Setting the frontend from property cache\n",
+                       __func__);
 
                r = dtv_set_frontend(fe);
                break;
@@ -1913,7 +1911,6 @@ static int dvb_frontend_ioctl(struct file *file, unsigned int cmd, void *parg)
 {
        struct dvb_device *dvbdev = file->private_data;
        struct dvb_frontend *fe = dvbdev->priv;
-       struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        struct dvb_frontend_private *fepriv = fe->frontend_priv;
        int err;
 
@@ -1933,7 +1930,6 @@ static int dvb_frontend_ioctl(struct file *file, unsigned int cmd, void *parg)
                return -EPERM;
        }
 
-       c->state = DTV_UNDEFINED;
        err = dvb_frontend_handle_ioctl(file, cmd, parg);
 
        up(&fepriv->sem);
@@ -2117,10 +2113,6 @@ static int dvb_frontend_handle_ioctl(struct file *file,
                        }
                        (tvp + i)->result = err;
                }
-
-               if (c->state == DTV_TUNE)
-                       dev_dbg(fe->dvb->device, "%s: Property cache is full, tuning\n", __func__);
-
                kfree(tvp);
                break;
        }

diff --git a/drivers/media/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h
index 852b91ba49d279366fe5d0c7151b31af5f66f271..1bdeb10f0d7870842b67e548bd95aa55d32e2b5a 100644 (file)
--- a/drivers/media/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb-core/dvb_frontend.h
@@ -620,11 +620,6 @@ struct dtv_frontend_properties {
        struct dtv_fe_stats     post_bit_count;
        struct dtv_fe_stats     block_error;
        struct dtv_fe_stats     block_count;
-
-       /* private: */
-       /* Cache State */
-       u32                     state;
-
 };
 
 #define DVB_FE_NO_EXIT  0