lkml.org 
[lkml]   [2020]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC 21/50] staging: vchi: Get rid of flags argument in vchi_msg_hold()
    Date
    All users are ignoring the flags argument. So for the sake of
    simplicity delete it.

    Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
    ---
    .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 3 +--
    drivers/staging/vc04_services/interface/vchi/vchi.h | 1 -
    .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 12 +++---------
    .../staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c | 2 +-
    .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +-
    5 files changed, 6 insertions(+), 14 deletions(-)

    diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
    index 5018b5baa009..68119246f10b 100644
    --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
    +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
    @@ -102,8 +102,7 @@ static void audio_vchi_callback(void *param,
    if (reason != VCHI_CALLBACK_MSG_AVAILABLE)
    return;

    - status = vchi_msg_hold(instance->service, (void **)&m, &size,
    - VCHI_FLAGS_NONE, &handle);
    + status = vchi_msg_hold(instance->service, (void **)&m, &size, &handle);
    if (status)
    return;

    diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
    index 55e51e5a1fdc..92ce811fc28d 100644
    --- a/drivers/staging/vc04_services/interface/vchi/vchi.h
    +++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
    @@ -87,7 +87,6 @@ extern int vchi_queue_kernel_message(struct vchi_service *service, void *data,
    extern int32_t vchi_msg_hold(struct vchi_service *service,
    void **data, // } may be NULL, as info can be
    uint32_t *msg_size, // } obtained from HELD_MSG_T
    - enum vchi_flags flags,
    struct vchi_held_msg *message_descriptor);

    /*******************************************************************************
    diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
    index 0c3473861a8d..0466512cfe3c 100644
    --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
    +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
    @@ -195,7 +195,6 @@ EXPORT_SYMBOL(vchi_held_msg_release);
    * Arguments: struct vchi_service *service,
    * void **data,
    * uint32_t *msg_size,
    - * enum vchi_flags flags,
    * struct vchi_held_msg *message_handle
    *
    * Description: Routine to return a pointer to the current message (to allow
    @@ -207,17 +206,12 @@ EXPORT_SYMBOL(vchi_held_msg_release);
    *
    ***********************************************************/
    int32_t vchi_msg_hold(struct vchi_service *service, void **data,
    - uint32_t *msg_size, enum vchi_flags flags,
    - struct vchi_held_msg *message_handle)
    + uint32_t *msg_size, struct vchi_held_msg *message_handle)
    {
    struct vchiq_header *header;

    - WARN_ON((flags != VCHI_FLAGS_NONE) &&
    - (flags != VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE));
    -
    - if (flags == VCHI_FLAGS_NONE)
    - if (vchiu_queue_is_empty(&service->queue))
    - return -1;
    + if (vchiu_queue_is_empty(&service->queue))
    + return -1;

    header = vchiu_queue_pop(&service->queue);

    diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
    index 72b09685db31..826cac7922d2 100644
    --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
    +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
    @@ -237,7 +237,7 @@ static int vc_sm_cma_vchi_videocore_io(void *arg)
    } while (1);

    while (!vchi_msg_hold(instance->service, (void **)&reply,
    - &reply_len, VCHI_FLAGS_NONE, &msg)) {
    + &reply_len, &msg)) {
    if (reply->trans_id & 0x80000000) {
    /* Async event or cmd from the VPU */
    if (instance->vpu_event)
    diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
    index 5183aff453eb..9f905f529d91 100644
    --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
    +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
    @@ -693,7 +693,7 @@ static void service_callback(void *param,
    switch (reason) {
    case VCHI_CALLBACK_MSG_AVAILABLE:
    status = vchi_msg_hold(instance->service, (void **)&msg,
    - &msg_len, VCHI_FLAGS_NONE, &msg_handle);
    + &msg_len, &msg_handle);
    if (status) {
    pr_err("Unable to dequeue a message (%d)\n", status);
    break;
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-05-27 13:58    [W:2.480 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site