lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 354/459] ide: remove set but not used variable 'hwif'
    Date
    From: Wang Hai <wanghai38@huawei.com>

    [ Upstream commit 98949a1946d70771789def0c9dbc239497f9f138 ]

    Fix the following gcc warning:

    drivers/ide/pmac.c: In function pmac_ide_setup_device:
    drivers/ide/pmac.c:1027:14: warning: variable hwif set but not used
    [-Wunused-but-set-variable]

    Fixes: d58b0c39e32f ("powerpc/macio: Rework hotplug media bay support")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Wang Hai <wanghai38@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/ide/pmac.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
    index b5647e34e74ee..ea0b064b5f56b 100644
    --- a/drivers/ide/pmac.c
    +++ b/drivers/ide/pmac.c
    @@ -1019,7 +1019,6 @@ static int pmac_ide_setup_device(pmac_ide_hwif_t *pmif, struct ide_hw *hw)
    struct device_node *np = pmif->node;
    const int *bidp;
    struct ide_host *host;
    - ide_hwif_t *hwif;
    struct ide_hw *hws[] = { hw };
    struct ide_port_info d = pmac_port_info;
    int rc;
    @@ -1075,7 +1074,7 @@ static int pmac_ide_setup_device(pmac_ide_hwif_t *pmif, struct ide_hw *hw)
    rc = -ENOMEM;
    goto bail;
    }
    - hwif = pmif->hwif = host->ports[0];
    + pmif->hwif = host->ports[0];

    if (on_media_bay(pmif)) {
    /* Fixup bus ID for media bay */
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 18:24    [W:7.464 / U:1.832 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site