From: Alexander Graf <agraf@suse.de>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, michal.simek@xilinx.com,
Dan Murphy <dmurphy@ti.com>,
andrew@lunn.ch
Subject: [PATCH v2 1/2] phy dp83867: Fix compilation with CONFIG_OF_MDIO=m
Date: Mon, 16 May 2016 20:52:42 +0200 [thread overview]
Message-ID: <1463424763-58807-1-git-send-email-agraf@suse.de> (raw)
When CONFIG_OF_MDIO is configured as module, the #define for it really
is CONFIG_OF_MDIO_MODULE, not CONFIG_OF_MDIO. So if we are compiling it
as module, the dp83867 doesn't see that OF_MDIO was selected and doesn't
read the dt rgmii parameters.
The fix is simple: Use IS_ENABLED(). It checks for both - module as well
as compiled in code.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
drivers/net/phy/dp83867.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 2afa61b..94cc278 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -99,7 +99,7 @@ static int dp83867_config_intr(struct phy_device *phydev)
return phy_write(phydev, MII_DP83867_MICR, micr_status);
}
-#ifdef CONFIG_OF_MDIO
+#if IS_ENABLED(CONFIG_OF_MDIO)
static int dp83867_of_init(struct phy_device *phydev)
{
struct dp83867_private *dp83867 = phydev->priv;
--
1.8.5.6
next reply other threads:[~2016-05-16 18:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-16 18:52 Alexander Graf [this message]
2016-05-16 18:52 ` [PATCH v2 2/2] phy dp83867: Make rgmii parameters optional Alexander Graf
2016-05-16 19:04 ` Florian Fainelli
2016-05-16 20:15 ` Andrew Lunn
2016-05-16 20:27 ` Dan Murphy
2016-05-17 18:22 ` David Miller
2016-05-17 18:34 ` Dan Murphy
2016-05-17 18:48 ` David Miller
2016-05-17 20:37 ` Alexander Graf
2016-05-17 20:40 ` Dan Murphy
2016-05-17 20:45 ` Alexander Graf
2016-05-17 18:22 ` [PATCH v2 1/2] phy dp83867: Fix compilation with CONFIG_OF_MDIO=m 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=1463424763-58807-1-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=andrew@lunn.ch \
--cc=dmurphy@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).