From: Christian Lamparter <chunkeey@gmail.com>
Date: Wed, 13 Mar 2019 16:22:27 +0000 (+0100)
Subject: ipq40xx: remove redundant PHY_POLL set code
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6825b4ca9532d44b183ad3cbd2eb3a06e5c8f597;p=openwrt%2Fstaging%2Fadrian.git

ipq40xx: remove redundant PHY_POLL set code

The [devm_]mdiobus_alloc[_size()] functions are creating
the array of interrupt numbers as well as initializing
them to POLLING.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/target/linux/ipq40xx/patches-4.14/700-net-add-qualcomm-mdio-and-phy.patch b/target/linux/ipq40xx/patches-4.14/700-net-add-qualcomm-mdio-and-phy.patch
index 00cfa3ab9b..33184ff527 100644
--- a/target/linux/ipq40xx/patches-4.14/700-net-add-qualcomm-mdio-and-phy.patch
+++ b/target/linux/ipq40xx/patches-4.14/700-net-add-qualcomm-mdio-and-phy.patch
@@ -2484,7 +2484,7 @@ Subject: [PATCH 30/38] NET: add qualcomm mdio and PHY
 +#endif
 --- /dev/null
 +++ b/drivers/net/phy/mdio-ipq40xx.c
-@@ -0,0 +1,203 @@
+@@ -0,0 +1,198 @@
 +/*
 + * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
 + *
@@ -2527,7 +2527,6 @@ Subject: [PATCH 30/38] NET: add qualcomm mdio and PHY
 +struct ipq40xx_mdio_data {
 +	struct mii_bus	*mii_bus;
 +	void __iomem	*membase;
-+	int		phy_irq[PHY_MAX_ADDR];
 +	struct device	*dev;
 +};
 +
@@ -2644,10 +2643,6 @@ Subject: [PATCH 30/38] NET: add qualcomm mdio and PHY
 +	am->mii_bus->parent = &pdev->dev;
 +	snprintf(am->mii_bus->id, MII_BUS_ID_SIZE, "%s", dev_name(&pdev->dev));
 +
-+	for (i = 0; i < PHY_MAX_ADDR; i++)
-+		am->phy_irq[i] = PHY_POLL;
-+
-+	memcpy(am->mii_bus->irq, am->phy_irq, sizeof(am->phy_irq));
 +	am->dev = &pdev->dev;
 +	platform_set_drvdata(pdev, am);
 +
diff --git a/target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio.patch b/target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio.patch
index d67e59afe6..e939597b8e 100644
--- a/target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio.patch
+++ b/target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio.patch
@@ -26,7 +26,7 @@
  obj-$(CONFIG_MDIO_OCTEON)	+= mdio-octeon.o
 --- /dev/null
 +++ b/drivers/net/phy/mdio-ipq40xx.c
-@@ -0,0 +1,201 @@
+@@ -0,0 +1,196 @@
 +/*
 + * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
 + *
@@ -69,7 +69,6 @@
 +struct ipq40xx_mdio_data {
 +	struct mii_bus	*mii_bus;
 +	void __iomem	*membase;
-+	int		phy_irq[PHY_MAX_ADDR];
 +	struct device	*dev;
 +};
 +
@@ -186,10 +185,6 @@
 +	am->mii_bus->parent = &pdev->dev;
 +	snprintf(am->mii_bus->id, MII_BUS_ID_SIZE, "%s", dev_name(&pdev->dev));
 +
-+	for (i = 0; i < PHY_MAX_ADDR; i++)
-+		am->phy_irq[i] = PHY_POLL;
-+
-+	memcpy(am->mii_bus->irq, am->phy_irq, sizeof(am->phy_irq));
 +	am->dev = &pdev->dev;
 +	platform_set_drvdata(pdev, am);
 +