From patchwork Tue Jun 23 19:55:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191605 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1369176ecs; Tue, 23 Jun 2020 14:28:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSUxVqyC2kHWLxZ4nDwuaTvtn5U494Nb1nxXaeBgo+98lYHP3UVr2JzyZ9o4z2OKhKypZW X-Received: by 2002:a50:a687:: with SMTP id e7mr22676050edc.62.1592947695626; Tue, 23 Jun 2020 14:28:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592947695; cv=none; d=google.com; s=arc-20160816; b=Cf+1E3pjQP+ehhNbY5ic17vKRjsuiwDcX0HtV3+fAzqctJELC8iJzaRrQKTgZ6BhGs 9zrZUYLq+GMyVUxVq9VI4iMg44RCRaYbJsslk5BV2GOBlZwmhsFC+pBRJjVaZjcQfpYi TjP/qBZ/6BB4DcuIHB5BgK8OiD1AB7vwYhM/iRFAhpzbaI//AlN6KOftPkSnqLU353Ql 5h0NKg9yeTE0iydvxxKRYhXef/cta0/5XKMRZgu0Ck/gfqGOkDqZRc2SwZrwjpsWTDNl Sih8xac6V6zvH0VnFyGuobCOpZ1EUvg2effflXkzi+//yLhr/zE7kzl2CnhWWD006zOa HiXA== 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=czN+Q63+OXlamzWer8uREcxyuXP4d/deWFgTkaD4UGc=; b=EuTDWVu6yQOgoKtoM68DhjCWsACi1I1juNFDDrcjEHQBXcRfpfAvoDak2NilTMxuhc P7ysMub/nC7wio1IpE6tyC0qBTOxqr3em0ubU39hYLpLUisYlJzWlfzZqP2jB+YcORuB 1+Yx0gP+uR3DrMOwtzBDnIi957kwOyFbjIcd3paMEOodZQiCr48Z098R5YMlr+0Wzh7C eexk5mC5GVEww6zWczeEM7h3vFI1PVAPwmaZb1j0bj4K5KRUrkkxr35CZtHN40UbpqAC YVOSNY0i1T1ULyDm5NZ+g+9qeoMtJ2gkkR5wDRP+/dPtZQ+Kb0xNKPThHWltPGluJVyY r5GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="H/37c8F5"; 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 e24si7887503edy.323.2020.06.23.14.28.15; Tue, 23 Jun 2020 14:28:15 -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="H/37c8F5"; 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 S2388901AbgFWUQI (ORCPT + 15 others); Tue, 23 Jun 2020 16:16:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:59406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388390AbgFWUQH (ORCPT ); Tue, 23 Jun 2020 16:16:07 -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 C25B020EDD; Tue, 23 Jun 2020 20:16:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943367; bh=6RzejahLlQrgdvaRPrW8GQkygqnCDz26sEXC25Ezzs0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H/37c8F5XuQFjnAx3KJXEAQapH5rZCGZ/fDdkk2lPSb67z8maDPoMO/tmsdzLI69c sTtjf/5+O8PIQ8uNQPt8MdCssABxOX6qYR1+S+1a0dLxMnQcmvsGjk964J5CR0lNxf G4XRLMlz0r3udOPJ0zjr16SzlM3LqywCEw77Zh6I= 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 337/477] net: marvell: Fix OF_MDIO config check Date: Tue, 23 Jun 2020 21:55:34 +0200 Message-Id: <20200623195423.470746470@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 5cd119d9a05f1c1a08778a7305b4ca0f16bc1e20 ] 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 Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/marvell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 7fc8e10c5f337..a435f7352cfb0 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -337,7 +337,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. *