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 05/11] staging: crystalhd: clean up crystalhd_setup_cmd_context() return code
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    ---
    drivers/staging/crystalhd/crystalhd_cmds.c | 9 +++++----
    drivers/staging/crystalhd/crystalhd_cmds.h | 2 +-
    drivers/staging/crystalhd/crystalhd_lnx.c | 7 +++----
    3 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/drivers/staging/crystalhd/crystalhd_cmds.c b/drivers/staging/crystalhd/crystalhd_cmds.c
    index 26145a8..516e825 100644
    --- a/drivers/staging/crystalhd/crystalhd_cmds.c
    +++ b/drivers/staging/crystalhd/crystalhd_cmds.c
    @@ -948,14 +948,14 @@ BC_STATUS crystalhd_user_close(struct crystalhd_cmd *ctx, struct crystalhd_user
    *
    * Called at the time of driver load.
    */
    -BC_STATUS __devinit crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx,
    - struct crystalhd_adp *adp)
    +int __devinit crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx,
    + struct crystalhd_adp *adp)
    {
    int i = 0;

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

    if (ctx->adp)
    @@ -971,7 +971,8 @@ BC_STATUS __devinit crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx,
    /*Open and Close the Hardware to put it in to sleep state*/
    crystalhd_hw_open(&ctx->hw_ctx, ctx->adp);
    crystalhd_hw_close(&ctx->hw_ctx);
    - return BC_STS_SUCCESS;
    +
    + return 0;
    }

    /**
    diff --git a/drivers/staging/crystalhd/crystalhd_cmds.h b/drivers/staging/crystalhd/crystalhd_cmds.h
    index 6b290ae..90b4467 100644
    --- a/drivers/staging/crystalhd/crystalhd_cmds.h
    +++ b/drivers/staging/crystalhd/crystalhd_cmds.h
    @@ -81,7 +81,7 @@ crystalhd_cmd_proc crystalhd_get_cmd_proc(struct crystalhd_cmd *ctx, uint32_t cm
    struct crystalhd_user *uc);
    BC_STATUS crystalhd_user_open(struct crystalhd_cmd *ctx, struct crystalhd_user **user_ctx);
    BC_STATUS crystalhd_user_close(struct crystalhd_cmd *ctx, struct crystalhd_user *uc);
    -BC_STATUS crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx, struct crystalhd_adp *adp);
    +int crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx, struct crystalhd_adp *adp);
    BC_STATUS crystalhd_delete_cmd_context(struct crystalhd_cmd *ctx);
    bool crystalhd_cmd_interrupt(struct crystalhd_cmd *ctx);

    diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
    index a68b5ff..490d2e0 100644
    --- a/drivers/staging/crystalhd/crystalhd_lnx.c
    +++ b/drivers/staging/crystalhd/crystalhd_lnx.c
    @@ -542,7 +542,6 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
    {
    struct crystalhd_adp *pinfo;
    int rc;
    - BC_STATUS sts = BC_STS_SUCCESS;

    BCMLOG(BCMLOG_DBG, "PCI_INFO: Vendor:0x%04x Device:0x%04x "
    "s_vendor:0x%04x s_device: 0x%04x\n",
    @@ -602,9 +601,9 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
    return -ENODEV;
    }

    - sts = crystalhd_setup_cmd_context(&pinfo->cmds, pinfo);
    - if (sts != BC_STS_SUCCESS) {
    - BCMLOG_ERR("cmd setup :%d \n", sts);
    + rc = crystalhd_setup_cmd_context(&pinfo->cmds, pinfo);
    + if (rc) {
    + BCMLOG_ERR("cmd setup :%d \n", rc);
    pci_disable_device(pdev);
    return -ENODEV;
    }
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-04-25 15:47    [W:0.088 / U:0.132 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site