lkml.org 
[lkml]   [2019]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 051/237] scsi: isci: Use proper enumerated type in atapi_d2h_reg_frame_handler
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit e9e9a103528c7e199ead6e5374c9c52cf16b5802 ]

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

    drivers/scsi/isci/request.c:1629:13: warning: implicit conversion from
    enumeration type 'enum sci_io_status' to different enumeration type
    'enum sci_status' [-Wenum-conversion]
    status = SCI_IO_FAILURE_RESPONSE_VALID;
    ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    drivers/scsi/isci/request.c:1631:12: warning: implicit conversion from
    enumeration type 'enum sci_io_status' to different enumeration type
    'enum sci_status' [-Wenum-conversion]
    status = SCI_IO_FAILURE_RESPONSE_VALID;
    ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    status is of type sci_status but SCI_IO_FAILURE_RESPONSE_VALID is of
    type sci_io_status. Use SCI_FAILURE_IO_RESPONSE_VALID, which is from
    sci_status and has SCI_IO_FAILURE_RESPONSE_VALID's exact value since
    that is what SCI_IO_FAILURE_RESPONSE_VALID is mapped to in the isci.h
    file.

    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/request.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
    index ed197bc8e801a..2f151708b59ae 100644
    --- a/drivers/scsi/isci/request.c
    +++ b/drivers/scsi/isci/request.c
    @@ -1626,9 +1626,9 @@ static enum sci_status atapi_d2h_reg_frame_handler(struct isci_request *ireq,

    if (status == SCI_SUCCESS) {
    if (ireq->stp.rsp.status & ATA_ERR)
    - status = SCI_IO_FAILURE_RESPONSE_VALID;
    + status = SCI_FAILURE_IO_RESPONSE_VALID;
    } else {
    - status = SCI_IO_FAILURE_RESPONSE_VALID;
    + status = SCI_FAILURE_IO_RESPONSE_VALID;
    }

    if (status != SCI_SUCCESS) {
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-16 17:25    [W:4.142 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site