lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 047/211] scsi: isci: Change sci_controller_start_tasks return type to sci_status
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit 362b5da3dfceada6e74ecdd7af3991bbe42c0c0f ]

    Clang warns when an enumerated type is implicitly converted to another.

    drivers/scsi/isci/request.c:3476:13: warning: implicit conversion from
    enumeration type 'enum sci_task_status' to different enumeration type
    'enum sci_status' [-Wenum-conversion]
    status = sci_controller_start_task(ihost,
    ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    drivers/scsi/isci/host.c:2744:10: warning: implicit conversion from
    enumeration type 'enum sci_status' to different enumeration type 'enum
    sci_task_status' [-Wenum-conversion]
    return SCI_SUCCESS;
    ~~~~~~ ^~~~~~~~~~~
    drivers/scsi/isci/host.c:2753:9: warning: implicit conversion from
    enumeration type 'enum sci_status' to different enumeration type 'enum
    sci_task_status' [-Wenum-conversion]
    return status;
    ~~~~~~ ^~~~~~

    Avoid all of these implicit conversion by just making
    sci_controller_start_task use sci_status. This silences
    Clang and has no functional change since sci_task_status
    has all of its values mapped to something in sci_status.

    Link: https://github.com/ClangBuiltLinux/linux/issues/153
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/isci/host.c | 8 ++++----
    drivers/scsi/isci/host.h | 2 +-
    drivers/scsi/isci/task.c | 4 ++--
    3 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
    index 609dafd661d14..da4583a2fa23e 100644
    --- a/drivers/scsi/isci/host.c
    +++ b/drivers/scsi/isci/host.c
    @@ -2717,9 +2717,9 @@ enum sci_status sci_controller_continue_io(struct isci_request *ireq)
    * the task management request.
    * @task_request: the handle to the task request object to start.
    */
    -enum sci_task_status sci_controller_start_task(struct isci_host *ihost,
    - struct isci_remote_device *idev,
    - struct isci_request *ireq)
    +enum sci_status sci_controller_start_task(struct isci_host *ihost,
    + struct isci_remote_device *idev,
    + struct isci_request *ireq)
    {
    enum sci_status status;

    @@ -2728,7 +2728,7 @@ enum sci_task_status sci_controller_start_task(struct isci_host *ihost,
    "%s: SCIC Controller starting task from invalid "
    "state\n",
    __func__);
    - return SCI_TASK_FAILURE_INVALID_STATE;
    + return SCI_FAILURE_INVALID_STATE;
    }

    status = sci_remote_device_start_task(ihost, idev, ireq);
    diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h
    index b3539928073c6..6bc3f022630a2 100644
    --- a/drivers/scsi/isci/host.h
    +++ b/drivers/scsi/isci/host.h
    @@ -489,7 +489,7 @@ enum sci_status sci_controller_start_io(
    struct isci_remote_device *idev,
    struct isci_request *ireq);

    -enum sci_task_status sci_controller_start_task(
    +enum sci_status sci_controller_start_task(
    struct isci_host *ihost,
    struct isci_remote_device *idev,
    struct isci_request *ireq);
    diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
    index 6dcaed0c1fc8c..fb6eba331ac6e 100644
    --- a/drivers/scsi/isci/task.c
    +++ b/drivers/scsi/isci/task.c
    @@ -258,7 +258,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost,
    struct isci_tmf *tmf, unsigned long timeout_ms)
    {
    DECLARE_COMPLETION_ONSTACK(completion);
    - enum sci_task_status status = SCI_TASK_FAILURE;
    + enum sci_status status = SCI_FAILURE;
    struct isci_request *ireq;
    int ret = TMF_RESP_FUNC_FAILED;
    unsigned long flags;
    @@ -301,7 +301,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost,
    /* start the TMF io. */
    status = sci_controller_start_task(ihost, idev, ireq);

    - if (status != SCI_TASK_SUCCESS) {
    + if (status != SCI_SUCCESS) {
    dev_dbg(&ihost->pdev->dev,
    "%s: start_io failed - status = 0x%x, request = %p\n",
    __func__,
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-27 21:49    [W:3.337 / U:0.592 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site