qlcnic: Remove redundant unlock in qlcnic_pinit_from_rom
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Fri, 3 Sep 2021 07:35:43 +0000 (15:35 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Sep 2021 09:43:10 +0000 (11:43 +0200)
[ Upstream commit 9ddbc2a00d7f63fa9748f4278643193dac985f2d ]

Previous commit 68233c583ab4 removes the qlcnic_rom_lock()
in qlcnic_pinit_from_rom(), but remains its corresponding
unlock function, which is odd. I'm not very sure whether the
lock is missing, or the unlock is redundant. This bug is
suggested by a static analysis tool, please advise.

Fixes: 68233c583ab4 ("qlcnic: updated reset sequence")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c

index be41e4c77b657285841c610c1f30a701dc2c87ee..eff587c6e9be8835a1e23cbe757ac44e5b4df28a 100644 (file)
@@ -440,7 +440,6 @@ int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter)
        QLCWR32(adapter, QLCNIC_CRB_PEG_NET_4 + 0x3c, 1);
        msleep(20);
 
-       qlcnic_rom_unlock(adapter);
        /* big hammer don't reset CAM block on reset */
        QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0xfeffffff);