disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c
..
..
@@ -1,9 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Adaptrum Anarion DWMAC glue layer
3
4
  *
4
5
  * Copyright (C) 2017, Adaptrum, Inc.
5
6
  * (Written by Alexandru Gagniuc <alex.g at adaptrum.com> for Adaptrum, Inc.)
6
- * Licensed under the GPLv2 or (at your option) any later version.
7
7
  */
8
8
 
9
9
 #include <linux/io.h>
..
..
@@ -61,13 +61,12 @@
61
61
 
62
62
 static struct anarion_gmac *anarion_config_dt(struct platform_device *pdev)
63
63
 {
64
-	int phy_mode;
65
-	struct resource *res;
66
-	void __iomem *ctl_block;
67
64
 	struct anarion_gmac *gmac;
65
+	phy_interface_t phy_mode;
66
+	void __iomem *ctl_block;
67
+	int err;
68
68
 
69
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
70
-	ctl_block = devm_ioremap_resource(&pdev->dev, res);
69
+	ctl_block = devm_platform_ioremap_resource(pdev, 1);
71
70
 	if (IS_ERR(ctl_block)) {
72
71
 		dev_err(&pdev->dev, "Cannot get reset region (%ld)!\n",
73
72
 			PTR_ERR(ctl_block));
..
..
@@ -80,11 +79,15 @@
80
79
 
81
80
 	gmac->ctl_block = (uintptr_t)ctl_block;
82
81
 
83
-	phy_mode = of_get_phy_mode(pdev->dev.of_node);
82
+	err = of_get_phy_mode(pdev->dev.of_node, &phy_mode);
83
+	if (err)
84
+		return ERR_PTR(err);
85
+
84
86
 	switch (phy_mode) {
85
-	case PHY_INTERFACE_MODE_RGMII:		/* Fall through */
86
-	case PHY_INTERFACE_MODE_RGMII_ID	/* Fall through */:
87
-	case PHY_INTERFACE_MODE_RGMII_RXID:	/* Fall through */
87
+	case PHY_INTERFACE_MODE_RGMII:
88
+		fallthrough;
89
+	case PHY_INTERFACE_MODE_RGMII_ID:
90
+	case PHY_INTERFACE_MODE_RGMII_RXID:
88
91
 	case PHY_INTERFACE_MODE_RGMII_TXID:
89
92
 		gmac->phy_intf_sel = GMAC_CONFIG_INTF_RGMII;
90
93
 		break;