lkml.org 
[lkml]   [2010]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 08/11] staging: crystalhd: clean up crystalhd_user_open() return code
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    ---
    drivers/staging/crystalhd/crystalhd_cmds.c | 10 +++++-----
    drivers/staging/crystalhd/crystalhd_cmds.h | 2 +-
    drivers/staging/crystalhd/crystalhd_lnx.c | 9 ++++-----
    3 files changed, 10 insertions(+), 11 deletions(-)

    diff --git a/drivers/staging/crystalhd/crystalhd_cmds.c b/drivers/staging/crystalhd/crystalhd_cmds.c
    index d341876..1286ed9 100644
    --- a/drivers/staging/crystalhd/crystalhd_cmds.c
    +++ b/drivers/staging/crystalhd/crystalhd_cmds.c
    @@ -875,20 +875,20 @@ BC_STATUS crystalhd_resume(struct crystalhd_cmd *ctx)
    * application specific resources. HW layer initialization
    * is done for the first open request.
    */
    -BC_STATUS crystalhd_user_open(struct crystalhd_cmd *ctx,
    - struct crystalhd_user **user_ctx)
    +int crystalhd_user_open(struct crystalhd_cmd *ctx,
    + struct crystalhd_user **user_ctx)
    {
    struct crystalhd_user *uc;

    if (!ctx || !user_ctx) {
    BCMLOG_ERR("Invalid arg..\n");
    - return BC_STS_INV_ARG;
    + return -EINVAL;
    }

    uc = bc_cproc_get_uid(ctx);
    if (!uc) {
    BCMLOG(BCMLOG_INFO, "No free user context...\n");
    - return BC_STS_BUSY;
    + return -EBUSY;
    }

    BCMLOG(BCMLOG_INFO, "Opening new user[%x] handle\n", uc->uid);
    @@ -899,7 +899,7 @@ BC_STATUS crystalhd_user_open(struct crystalhd_cmd *ctx,

    *user_ctx = uc;

    - return BC_STS_SUCCESS;
    + return 0;
    }

    /**
    diff --git a/drivers/staging/crystalhd/crystalhd_cmds.h b/drivers/staging/crystalhd/crystalhd_cmds.h
    index 026a07e..8e15bf2 100644
    --- a/drivers/staging/crystalhd/crystalhd_cmds.h
    +++ b/drivers/staging/crystalhd/crystalhd_cmds.h
    @@ -79,7 +79,7 @@ BC_STATUS crystalhd_suspend(struct crystalhd_cmd *ctx, crystalhd_ioctl_data *ida
    BC_STATUS crystalhd_resume(struct crystalhd_cmd *ctx);
    crystalhd_cmd_proc crystalhd_get_cmd_proc(struct crystalhd_cmd *ctx, uint32_t cmd,
    struct crystalhd_user *uc);
    -BC_STATUS crystalhd_user_open(struct crystalhd_cmd *ctx, struct crystalhd_user **user_ctx);
    +int crystalhd_user_open(struct crystalhd_cmd *ctx, struct crystalhd_user **user_ctx);
    void crystalhd_user_close(struct crystalhd_cmd *ctx, struct crystalhd_user *uc);
    int crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx, struct crystalhd_adp *adp);
    void crystalhd_delete_cmd_context(struct crystalhd_cmd *ctx);
    diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
    index 19769df..6f3c7a0 100644
    --- a/drivers/staging/crystalhd/crystalhd_lnx.c
    +++ b/drivers/staging/crystalhd/crystalhd_lnx.c
    @@ -294,8 +294,7 @@ static int chd_dec_ioctl(struct inode *in, struct file *fd,
    static int chd_dec_open(struct inode *in, struct file *fd)
    {
    struct crystalhd_adp *adp = chd_get_adp();
    - int rc = 0;
    - BC_STATUS sts = BC_STS_SUCCESS;
    + int rc;
    struct crystalhd_user *uc = NULL;

    BCMLOG_ENTER;
    @@ -309,9 +308,9 @@ static int chd_dec_open(struct inode *in, struct file *fd)
    return -EBUSY;
    }

    - sts = crystalhd_user_open(&adp->cmds, &uc);
    - if (sts != BC_STS_SUCCESS) {
    - BCMLOG_ERR("cmd_user_open - %d \n", sts);
    + rc = crystalhd_user_open(&adp->cmds, &uc);
    + if (rc) {
    + BCMLOG_ERR("cmd_user_open - %d \n", rc);
    rc = -EBUSY;
    }

    --
    1.7.1


    \
     
     \ /
      Last update: 2010-04-25 15:47    [W:9.336 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site