Commit c5f3ffe3 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jakub Kicinski
Browse files

net: stmmac: dwmac-qcom-ethqos: Drop an if with an always false condition



The remove callback is only ever called after .probe() returned
successfully. After that get_stmmac_bsp_priv() always return non-NULL.

Side note: The early exit would also be a bug because the return value
of qcom_ethqos_remove() is ignored by the device core and the device is
unbound unconditionally. So exiting early resulted in a dangerous
resource leak as all devm allocated resources (some memory and the
register mappings) are freed but the network device stays around.  Using
the network device afterwards probably oopses.

Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarMichal Kubiak <michal.kubiak@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b9bc44fe
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -667,11 +667,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)

static int qcom_ethqos_remove(struct platform_device *pdev)
{
	struct qcom_ethqos *ethqos;

	ethqos = get_stmmac_bsp_priv(&pdev->dev);
	if (!ethqos)
		return -ENODEV;
	struct qcom_ethqos *ethqos = get_stmmac_bsp_priv(&pdev->dev);

	stmmac_pltfr_remove(pdev);
	ethqos_clks_config(ethqos, false);