From patchwork Tue Jun 23 19:57:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191589 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1360203ecs; Tue, 23 Jun 2020 14:12:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmPcmKT9CeKy9GPtkHqGmPwfU3jzLzyWvJFD1/bti3wmuGbYn0g9whuzJh1/1Oxzmp9QNr X-Received: by 2002:a17:906:4d4c:: with SMTP id b12mr11783282ejv.506.1592946770786; Tue, 23 Jun 2020 14:12:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592946770; cv=none; d=google.com; s=arc-20160816; b=eua7ND0B8S0lHdfpJjhzcPC1eW+BIVSXeL9kx8ujLxmYZ6s82iD3rvuIlzWce3wmGR /hbdHoQLcbIJykvyE17tDmTPk9vXwhWfuFRoldUSuerQLogZAl4N/KddglVinvMGEBQv 0OW5LLHrCfXiG+ykSCqeeIf9bNkuc2hnoWDFsyrPzDhIVkpLaJFxoksKoHgFv6Qltgrm RSllIlMboCdfuiWSGSXghpI/Dbdgi8js8d0hG83bWHrn5O48Ghxy8DwW9+Ujz3TfCIzU dXXLhyeTmrKY0dSMog3OcNRU4qTVSn4zzA6+o70VFLu1XRFKLhZ9bHJluEVOY2uheUrD JkAg== 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=H8H+A50mihp0se2tzRx6AQU3d0qHmJ4rhufWdLnGKjo=; b=HlLkiC7xAJClsWeiEP1zfksbceY+eE1t4rRM8eIQCXGhAHqXKNq16zx4V5maND4AB/ sUECV/vuyz+qAD51CW/xQ5VKTWbAKXefbsXpwKJtEngVlX9MBw9ZPE1Oe17GdqGp1Dp7 drAieHwQKiJuEpWekhWRVJx9/aZJUQ6TwKuYG1T4HJ1pM8cD438rS7M6NIKED5TC8x0H jNNZHfOct4Dj/W09vqV5ywmtrcz8Y+wom8PmPFI8n4Vj2WLysRALA/BQPeh5cdCWgcAj N05XMSPV+/6XTL3sWBqia1O+dgYhTAoyekaS4tKVFuPfE/vy+D1dFZthM6FBxrcLQO12 q2Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xiMwsc0D; 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 bz9si11471745ejc.664.2020.06.23.14.12.50; Tue, 23 Jun 2020 14:12: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=xiMwsc0D; 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 S2391057AbgFWUbF (ORCPT + 15 others); Tue, 23 Jun 2020 16:31:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:51476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391181AbgFWUbD (ORCPT ); Tue, 23 Jun 2020 16:31:03 -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 89CF5206C3; Tue, 23 Jun 2020 20:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944264; bh=fleriWgx6Njua+UUeLzYxuGYivie5eQmAT4OYkQTLRw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xiMwsc0DrlGuGiS+oojot/4a62E65vesdr0DsWXo0UoqivlBJYqekZ7I1SvMa5Yx8 5Rb4mR3hsz/AfWGFfEzdtSFpRdfsu4QquGzf+g0el/xRdlXzYEfEA9EDJ6jIyGv8gd FR9HaThi2Ru/GBx3d+plOTCYPlKrvueji2vVW07k= 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.4 229/314] net: marvell: Fix OF_MDIO config check Date: Tue, 23 Jun 2020 21:57:04 +0200 Message-Id: <20200623195349.873864706@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195338.770401005@linuxfoundation.org> References: <20200623195338.770401005@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 a7796134e3be0..91cf1d1672637 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -358,7 +358,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. *