From patchwork Tue Jun 23 19:55:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191606 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1369465ecs; Tue, 23 Jun 2020 14:28:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoceZor6eh1JmvCsFVCAL9wUyp9sdGR7kTj/JUXt2BRnVgOY6LmvlwcBrXk45dtgLcO375 X-Received: by 2002:a17:907:20c4:: with SMTP id qq4mr13538192ejb.85.1592947730549; Tue, 23 Jun 2020 14:28:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592947730; cv=none; d=google.com; s=arc-20160816; b=FlfogDGt6thzVw4As6vb5UQvudQOW5jYuyLtumPpUNtTZVYUW5CdH6WFVxlQ17zV9v ATX0IHdFBD7NAHevHNxjJOUxH+9640OyicxTcFQt/zally9XVMzLmdMjYGCj/Ixc32Tv iMwDFyn21yul/jtcvDeMdLz5QP2loMgP2QY1QeeOKTx6o8RaApJtpFSDmcWXjmSKkXEo tjPifcnqTduejgMKAymPbwyBWDzngQ27o1R+wXE+52URqfeRdx1siB6cuKudvwfVropl kp8caAsEsP/H0GGyIH2IWku4/Rcv0W+I0cLdJ7eLzxfQq4LpUz/LXLXz8+8p25YcUzpA 62oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GyjjGCB2s/zlmDYmKNQApVtwhspqobgz6P90yvwbCT8=; b=hhbkPeccRfAEA3xUbk32SgZYiuAQHi2GufaVr4rqGXgKuZLnKBNm19Y0SVuew49feT 5No5idwuBNa6ru0pAWdaMy7k6aUO+1SrL3UKQIZ6sOIIG/7WnVjlaxn7AFeb6dFs6ra8 yOhH7ObTtf8YSKh33Z5x8YG9G+xJmEKumqSBio4Hw6ZwySl7kjW/iB9AfSqeFAraeUyw Xcdde3JHcMf5Z5pZUM92H57UK26HsXuZJldPC2o38mLaFTa9Ec0ENIzgmiLos1r510az 9HsExsvBm0eq37IWKVxGjEJQivWsP3jtS4yObo8XSBJh/gViB4DyKSH/553iWhaZl2dh tvfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ICQho6re; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j21si11468305ejm.613.2020.06.23.14.28.50; Tue, 23 Jun 2020 14:28:50 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ICQho6re; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389345AbgFWV2t (ORCPT + 15 others); Tue, 23 Jun 2020 17:28:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:58722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389101AbgFWUPj (ORCPT ); Tue, 23 Jun 2020 16:15:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A68F52080C; Tue, 23 Jun 2020 20:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943339; bh=g8N5YsB2wRO78MxTIYoOpkUVW6ucTYCxpFn8Ycm0xqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ICQho6reEr/Lg/npZuDxyw1/cANZz36MRzgI1dsoiPyr8zA87QkjwmCSCQ3O6aaLa 5Y0l38wkqPmP/unNQ3wu7VmCSnk3jFfzeWsJnPbmqFkEDYgXaM3eNkoBfUHasy0NjS 509rQHJloW9otPXy3aqlXiCX+MkgaekGlNDSH2b8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Murphy , Florian Fainelli , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 336/477] net: dp83867: Fix OF_MDIO config check Date: Tue, 23 Jun 2020 21:55:33 +0200 Message-Id: <20200623195423.423284308@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Murphy [ 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 Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/dp83867.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.25.1 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;