mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-03 10:02:20 -04:00
Merge branch 'net-hisilicon-minor-fixes'
Krzysztof Kozlowski says: ==================== net: hisilicon: minor fixes Minor fixes for hisilicon ethernet driver which look too trivial to be considered for current RC. ==================== Link: https://patch.msgid.link/20240827144421.52852-1-krzysztof.kozlowski@linaro.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
@@ -947,6 +947,7 @@ static int hip04_mac_probe(struct platform_device *pdev)
|
||||
priv->tx_coalesce_timer.function = tx_done;
|
||||
|
||||
priv->map = syscon_node_to_regmap(arg.np);
|
||||
of_node_put(arg.np);
|
||||
if (IS_ERR(priv->map)) {
|
||||
dev_warn(d, "no syscon hisilicon,hip04-ppe\n");
|
||||
ret = PTR_ERR(priv->map);
|
||||
|
||||
@@ -933,6 +933,7 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb)
|
||||
mac_cb->cpld_ctrl = NULL;
|
||||
} else {
|
||||
syscon = syscon_node_to_regmap(cpld_args.np);
|
||||
of_node_put(cpld_args.np);
|
||||
if (IS_ERR_OR_NULL(syscon)) {
|
||||
dev_dbg(mac_cb->dev, "no cpld-syscon found!\n");
|
||||
mac_cb->cpld_ctrl = NULL;
|
||||
|
||||
@@ -575,6 +575,7 @@ static int hns_mdio_probe(struct platform_device *pdev)
|
||||
MDIO_SC_RESET_ST;
|
||||
}
|
||||
}
|
||||
of_node_put(reg_args.np);
|
||||
} else {
|
||||
dev_warn(&pdev->dev, "find syscon ret = %#x\n", ret);
|
||||
mdio_dev->subctrl_vbase = NULL;
|
||||
|
||||
Reference in New Issue
Block a user