All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dan Murphy <dmurphy@ti.com>
To: <andrew@lunn.ch>, <f.fainelli@gmail.com>, <hkallweit1@gmail.com>,
	<davem@davemloft.net>, <kuba@kernel.org>
Cc: <linux@armlinux.org.uk>, <netdev@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, <michael@walle.cc>,
	Dan Murphy <dmurphy@ti.com>
Subject: [PATCH net 3/4] net: marvell: Fix OF_MDIO config check
Date: Fri, 5 Jun 2020 09:01:06 -0500	[thread overview]
Message-ID: <20200605140107.31275-4-dmurphy@ti.com> (raw)
In-Reply-To: <20200605140107.31275-1-dmurphy@ti.com>

When CONFIG_OF_MDIO is set to be a module the code block is not
compiled. Use the IS_ENABLED macro that checks for both built in as
well as module.

Fixes: cf41a51db8985 ("of/phylib: Use device tree properties to initialize Marvell PHYs.")
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
 drivers/net/phy/marvell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 4ea226566cec..c9ecf3c8c3fd 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -429,7 +429,7 @@ static int m88e1101_config_aneg(struct phy_device *phydev)
 	return marvell_config_aneg(phydev);
 }
 
-#ifdef CONFIG_OF_MDIO
+#if IS_ENABLED(CONFIG_OF_MDIO)
 /* Set and/or override some configuration registers based on the
  * marvell,reg-init property stored in the of_node for the phydev.
  *
-- 
2.26.2


  parent reply	other threads:[~2020-06-05 14:01 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-05 14:01 [PATCH net 0/4] Fixes for OF_MDIO flag Dan Murphy
2020-06-05 14:01 ` [PATCH net 1/4] net: dp83869: Fix OF_MDIO config check Dan Murphy
2020-06-05 16:30   ` Florian Fainelli
2020-06-05 14:01 ` [PATCH net 2/4] net: dp83867: " Dan Murphy
2020-06-05 16:30   ` Florian Fainelli
2020-06-05 14:01 ` Dan Murphy [this message]
2020-06-05 16:30   ` [PATCH net 3/4] net: marvell: " Florian Fainelli
2020-06-05 14:01 ` [PATCH net 4/4] net: mscc: " Dan Murphy
2020-06-05 16:30   ` Florian Fainelli
2020-06-05 20:15 ` [PATCH net 0/4] Fixes for OF_MDIO flag David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200605140107.31275-4-dmurphy@ti.com \
    --to=dmurphy@ti.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=hkallweit1@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=michael@walle.cc \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.