diff mbox

[net] phy: micrel: Fix build failure in ksz9031_config_init()

Message ID 1452340757-29507-1-git-send-email-sedat.dilek@gmail.com
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Sedat Dilek Jan. 9, 2016, 11:59 a.m. UTC
This fixes the following build failure seen in net.git#master on top of
Linux v4.4-rc8+:

drivers/net/phy/micrel.c: In function 'ksz9031_config_init':
drivers/net/phy/micrel.c:492:22: error: 'struct phy_device' has no member named 'dev'
  dev_walker = &phydev->dev;

Fixes: b4c19f71252e ("phy: micrel: Fix finding PHY properties in MAC node for KSZ9031.")
CC: Roosen Henri <Henri.Roosen@ginzinger.com>
CC: Andrew Lunn <andrew@lunn.ch>
CC: David Daney <david.daney@cavium.com>
CC: Florian Fainelli <f.fainelli@gmail.com>
CC: David S. Miller <davem@davemloft.net>
CC: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
---
[ dileks: v2: Add "[net]" to the subject-line ]

 drivers/net/phy/micrel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

kernel test robot Jan. 10, 2016, 11:50 a.m. UTC | #1
Hi Sedat,

[auto build test ERROR on net/master]
[cannot apply to net-next/master v4.4-rc8 next-20160108]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Sedat-Dilek/phy-micrel-Fix-build-failure-in-ksz9031_config_init/20160109-200009
config: x86_64-rhel (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   drivers/net/phy/micrel.c: In function 'ksz9031_config_init':
>> drivers/net/phy/micrel.c:479:22: error: 'struct phy_device' has no member named 'mdio'
     dev_walker = &phydev->mdio.dev;
                         ^

vim +479 drivers/net/phy/micrel.c

   473		const struct device *dev_walker;
   474	
   475		/* The Micrel driver has a deprecated option to place phy OF
   476		 * properties in the MAC node. Walk up the tree of devices to
   477		 * find a device with an OF node.
   478		 */
 > 479		dev_walker = &phydev->mdio.dev;
   480		do {
   481			of_node = dev_walker->of_node;
   482			dev_walker = dev_walker->parent;

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Sedat Dilek Jan. 11, 2016, 9:23 a.m. UTC | #2
On Sun, Jan 10, 2016 at 12:50 PM, kbuild test robot <lkp@intel.com> wrote:
> Hi Sedat,
>
> [auto build test ERROR on net/master]
> [cannot apply to net-next/master v4.4-rc8 next-20160108]
> [if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
>

Hi,

Andrew Lunn explained when this build-failure happens in [1].
Short answer: When you merge net.git with net-next.git.

Steven posted and added the same fix for his latest next-20160111 tree
(see [2]).
Dave ACKed it in [3].

- Sedat -

[0] http://marc.info/?l=linux-netdev&m=145235493501557&w=2
[1] http://marc.info/?l=linux-netdev&m=145248039325668&w=2
[3] http://marc.info/?l=linux-netdev&m=145248135925825&w=2

> url:    https://github.com/0day-ci/linux/commits/Sedat-Dilek/phy-micrel-Fix-build-failure-in-ksz9031_config_init/20160109-200009
> config: x86_64-rhel (attached as .config)
> reproduce:
>         # save the attached .config to linux build tree
>         make ARCH=x86_64
>
> All errors (new ones prefixed by >>):
>
>    drivers/net/phy/micrel.c: In function 'ksz9031_config_init':
>>> drivers/net/phy/micrel.c:479:22: error: 'struct phy_device' has no member named 'mdio'
>      dev_walker = &phydev->mdio.dev;
>                          ^
>
> vim +479 drivers/net/phy/micrel.c
>
>    473          const struct device *dev_walker;
>    474
>    475          /* The Micrel driver has a deprecated option to place phy OF
>    476           * properties in the MAC node. Walk up the tree of devices to
>    477           * find a device with an OF node.
>    478           */
>  > 479          dev_walker = &phydev->mdio.dev;
>    480          do {
>    481                  of_node = dev_walker->of_node;
>    482                  dev_walker = dev_walker->parent;
>
> ---
> 0-DAY kernel test infrastructure                Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 7a5679982c03..a7e17eabec37 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -476,7 +476,7 @@  static int ksz9031_config_init(struct phy_device *phydev)
 	 * properties in the MAC node. Walk up the tree of devices to
 	 * find a device with an OF node.
 	 */
-	dev_walker = &phydev->dev;
+	dev_walker = &phydev->mdio.dev;
 	do {
 		of_node = dev_walker->of_node;
 		dev_walker = dev_walker->parent;