lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 336/477] net: dp83867: Fix OF_MDIO config check
    Date
    From: Dan Murphy <dmurphy@ti.com>

    [ Upstream commit 506de00677b84dfc6718cbbd3495b1d90df5d098 ]

    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: 2a10154abcb75 ("net: phy: dp83867: Add TI dp83867 phy")
    Signed-off-by: Dan Murphy <dmurphy@ti.com>
    Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 b55e3c0403edd..ddac79960ea71 100644
    --- a/drivers/net/phy/dp83867.c
    +++ b/drivers/net/phy/dp83867.c
    @@ -488,7 +488,7 @@ static int dp83867_verify_rgmii_cfg(struct phy_device *phydev)
    return 0;
    }

    -#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;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 23:29    [W:4.104 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site