[PATCH 0/2] Fix for Ingenic MAC support.

1.Remove the unexpected "snps,dwmac" item in the example.
2.Remove unused variables in ingenic_mac_suspend() and
  ingenic_mac_resume().

周琰杰 (Zhou Yanjie) (2):
  dt-bindings: dwmac: Remove unexpected item.
  net: stmmac: Ingenic: Remove unused variables.

 Documentation/devicetree/bindings/net/ingenic,mac.yaml | 2 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c    | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

-- 
2.7.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Remove unused variables in ingenic_mac_suspend() and
ingenic_mac_resume().

Fixes: 2bb4b98b60d7 ("net: stmmac: Add Ingenic SoCs MAC support.")

Signed-off-by: 周琰杰 (Zhou Yanjie) <redacted>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c
index 667ed46..9a6d819 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c

@@ -311,9 +311,6 @@ static int ingenic_mac_probe(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int ingenic_mac_suspend(struct device *dev)
 {
-	struct net_device *ndev = dev_get_drvdata(dev);
-	struct stmmac_priv *priv = netdev_priv(ndev);
-	struct ingenic_mac *mac = priv->plat->bsp_priv;
 	int ret;
 
 	ret = stmmac_suspend(dev);

@@ -325,7 +322,6 @@ static int ingenic_mac_resume(struct device *dev)
 {
 	struct net_device *ndev = dev_get_drvdata(dev);
 	struct stmmac_priv *priv = netdev_priv(ndev);
-	struct ingenic_mac *mac = priv->plat->bsp_priv;
 	int ret;
 
 	ret = ingenic_mac_init(priv->plat);

-- 
2.7.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Remove the unexpected "snps,dwmac" item in the example.

Fixes: 3b8401066e5a ("dt-bindings: dwmac: Add bindings for new Ingenic SoCs.")

Signed-off-by: 周琰杰 (Zhou Yanjie) <redacted>
---
 Documentation/devicetree/bindings/net/ingenic,mac.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/net/ingenic,mac.yaml b/Documentation/devicetree/bindings/net/ingenic,mac.yaml
index 5e93d4f..d08a881 100644
--- a/Documentation/devicetree/bindings/net/ingenic,mac.yaml
+++ b/Documentation/devicetree/bindings/net/ingenic,mac.yaml

@@ -61,7 +61,7 @@ examples:
     #include <dt-bindings/clock/x1000-cgu.h>
 
     mac: ethernet@134b0000 {
-        compatible = "ingenic,x1000-mac", "snps,dwmac";
+        compatible = "ingenic,x1000-mac";
         reg = <0x134b0000 0x2000>;
 
         interrupt-parent = <&intc>;

-- 
2.7.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

On Sun, Jun 20, 2021 at 6:39 AM 周琰杰 (Zhou Yanjie)
[off-list ref] wrote:

Remove the unexpected "snps,dwmac" item in the example.

Fixes: 3b8401066e5a ("dt-bindings: dwmac: Add bindings for new Ingenic SoCs.")

Signed-off-by: 周琰杰 (Zhou Yanjie) <redacted>
---
 Documentation/devicetree/bindings/net/ingenic,mac.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

I'd apply Thierry's patch instead.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel