Em Fri, 15 Sep 2017 06:11:01 -0300
Mauro Carvalho Chehab <mche...@s-opensource.com> escreveu:

> Now that all clients of set_property() were removed, get rid
> of this callback.
> 
> Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com>
> ---
>  drivers/media/dvb-core/dvb_frontend.c | 7 -------
>  drivers/media/dvb-core/dvb_frontend.h | 2 --
>  2 files changed, 9 deletions(-)
> 
> diff --git a/drivers/media/dvb-core/dvb_frontend.c 
> b/drivers/media/dvb-core/dvb_frontend.c
> index 5d00e46d9432..8abe4f541a36 100644
> --- a/drivers/media/dvb-core/dvb_frontend.c
> +++ b/drivers/media/dvb-core/dvb_frontend.c
> @@ -1766,13 +1766,6 @@ static int dtv_property_process_set(struct 
> dvb_frontend *fe,
>       int r = 0;
>       struct dtv_frontend_properties *c = &fe->dtv_property_cache;
>  
> -     /* Allow the frontend to validate incoming properties */
> -     if (fe->ops.set_property) {
> -             r = fe->ops.set_property(fe, tvp);
> -             if (r < 0)
> -                     return r;
> -     }
> -
>       dtv_property_dump(fe, true, tvp);
>  
>       switch(tvp->cmd) {
> diff --git a/drivers/media/dvb-core/dvb_frontend.h 
> b/drivers/media/dvb-core/dvb_frontend.h
> index 4d05846f2c1c..a50f8216ab76 100644
> --- a/drivers/media/dvb-core/dvb_frontend.h
> +++ b/drivers/media/dvb-core/dvb_frontend.h
> @@ -401,8 +401,6 @@ struct dtv_frontend_properties;
>   * @search:          callback function used on some custom algo search algos.
>   * @tuner_ops:               pointer to struct dvb_tuner_ops
>   * @analog_ops:              pointer to struct analog_demod_ops
> - * @set_property:    callback function to allow the frontend to validade
> - *                   incoming properties. Should not be used on new drivers.
>   */
>  struct dvb_frontend_ops {

Hmm... actually, the patch is missing the removal of set_property().

The enclosed one should fix it.

Regards,
Mauro

---

[PATCH] media: dvb_frontend: get rid of set_property() callback

Now that all clients of set_property() were removed, get rid
of this callback.

Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com>

diff --git a/drivers/media/dvb-core/dvb_frontend.c 
b/drivers/media/dvb-core/dvb_frontend.c
index 5d00e46d9432..8abe4f541a36 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -1766,13 +1766,6 @@ static int dtv_property_process_set(struct dvb_frontend 
*fe,
        int r = 0;
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
 
-       /* Allow the frontend to validate incoming properties */
-       if (fe->ops.set_property) {
-               r = fe->ops.set_property(fe, tvp);
-               if (r < 0)
-                       return r;
-       }
-
        dtv_property_dump(fe, true, tvp);
 
        switch(tvp->cmd) {
diff --git a/drivers/media/dvb-core/dvb_frontend.h 
b/drivers/media/dvb-core/dvb_frontend.h
index 4d05846f2c1c..852b91ba49d2 100644
--- a/drivers/media/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb-core/dvb_frontend.h
@@ -401,11 +401,8 @@ struct dtv_frontend_properties;
  * @search:            callback function used on some custom algo search algos.
  * @tuner_ops:         pointer to struct dvb_tuner_ops
  * @analog_ops:                pointer to struct analog_demod_ops
- * @set_property:      callback function to allow the frontend to validade
- *                     incoming properties. Should not be used on new drivers.
  */
 struct dvb_frontend_ops {
-
        struct dvb_frontend_info info;
 
        u8 delsys[MAX_DELSYS];
@@ -464,8 +461,6 @@ struct dvb_frontend_ops {
 
        struct dvb_tuner_ops tuner_ops;
        struct analog_demod_ops analog_ops;
-
-       int (*set_property)(struct dvb_frontend* fe, struct dtv_property* tvp);
 };
 
 #ifdef __DVB_CORE__

Reply via email to