lkml.org 
[lkml]   [2020]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH stable 4.9 03/21] media: dvb/frontend.h: move out a private internal structure
    Date
    From: Mauro Carvalho Chehab <mchehab@s-opensource.com>

    commit f35afa4f60c868d7c7811ba747133acbf39410ac upstream

    struct dtv_cmds_h is just an ancillary struct used by the
    dvb_frontend.c to internally store frontend commands.

    It doesn't belong to the userspace header, nor it is used anywhere,
    except inside the DVB core. So, remove it from the header.

    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    ---
    drivers/media/dvb-core/dvb_frontend.c | 11 +++++++++++
    include/uapi/linux/dvb/frontend.h | 11 -----------
    2 files changed, 11 insertions(+), 11 deletions(-)

    diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
    index 3b045298546c..7eeb5d302c9c 100644
    --- a/drivers/media/dvb-core/dvb_frontend.c
    +++ b/drivers/media/dvb-core/dvb_frontend.c
    @@ -998,6 +998,17 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
    .buffer = b \
    }

    +struct dtv_cmds_h {
    + char *name; /* A display name for debugging purposes */
    +
    + __u32 cmd; /* A unique ID */
    +
    + /* Flags */
    + __u32 set:1; /* Either a set or get property */
    + __u32 buffer:1; /* Does this property use the buffer? */
    + __u32 reserved:30; /* Align */
    +};
    +
    static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {
    _DTV_CMD(DTV_TUNE, 1, 0),
    _DTV_CMD(DTV_CLEAR, 1, 0),
    diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h
    index afc3972b0879..3a80f3d1da1c 100644
    --- a/include/uapi/linux/dvb/frontend.h
    +++ b/include/uapi/linux/dvb/frontend.h
    @@ -384,17 +384,6 @@ enum atscmh_rs_code_mode {
    #define NO_STREAM_ID_FILTER (~0U)
    #define LNA_AUTO (~0U)

    -struct dtv_cmds_h {
    - char *name; /* A display name for debugging purposes */
    -
    - __u32 cmd; /* A unique ID */
    -
    - /* Flags */
    - __u32 set:1; /* Either a set or get property */
    - __u32 buffer:1; /* Does this property use the buffer? */
    - __u32 reserved:30; /* Align */
    -};
    -
    /**
    * Scale types for the quality parameters.
    * @FE_SCALE_NOT_AVAILABLE: That QoS measure is not available. That
    --
    2.17.1
    \
     
     \ /
      Last update: 2022-09-17 16:07    [W:2.419 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site