ibmvnic: merge do_change_param_reset into do_reset
authorLijun Pan <ljp@linux.ibm.com>
Sat, 31 Oct 2020 09:46:45 +0000 (04:46 -0500)
committerJakub Kicinski <kuba@kernel.org>
Tue, 3 Nov 2020 23:08:14 +0000 (15:08 -0800)
commit16b5f5ce351f8709a6b518cc3cbf240c378305bf
tree5d7ed18f48e8c79b6d2de2a0c049e7cef4aa03df
parent0992d67bc2bcd723d57c6ee7883bda4524450179
ibmvnic: merge do_change_param_reset into do_reset

Commit b27507bb59ed ("net/ibmvnic: unlock rtnl_lock in reset so
linkwatch_event can run") introduced do_change_param_reset function to
solve the rtnl lock issue. Majority of the code in do_change_param_reset
duplicates do_reset. Also, we can handle the rtnl lock issue in do_reset
itself. Hence merge do_change_param_reset back into do_reset to clean up
the code.

Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
Link: https://lore.kernel.org/r/20201031094645.17255-1-ljp@linux.ibm.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/ibm/ibmvnic.c