From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0D8AC433DF for ; Thu, 18 Jun 2020 02:11:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B2A220739 for ; Thu, 18 Jun 2020 02:11:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592446290; bh=Qjck8EbWyPCVno1+kOnWZaEQ2V1zZDtXuWvlXJk9zvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kjod9DO/hTQKLoZ4Ttj7MdwF4SzZSBhqgE8baKOoGt4vOwpFtGNYGz2jmLo/8CVpM L/hv9NWRquUcWO4JzSlVulFqdiSBfkfYj1D0L3q/RZ7NBoRlfSTxvhsc1Q0jHu1mlG XsnxHQsUti/DQQve9qOzAhYQ+ON/tsO5SGzoyuXk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729975AbgFRBVh (ORCPT ); Wed, 17 Jun 2020 21:21:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:54132 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730540AbgFRBVg (ORCPT ); Wed, 17 Jun 2020 21:21:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3327E20776; Thu, 18 Jun 2020 01:21:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443296; bh=Qjck8EbWyPCVno1+kOnWZaEQ2V1zZDtXuWvlXJk9zvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qDGCeKvnR2TbBffsTIoAoAPv2mJMzeuhcVOMBKgUfrm5N9aWbMhPC97Mtxh2kCssq bcKn7HOJTXgh6XoSHvsE4ILdUqsTzTs/IKoWvCiP2ufXQB3kcCAWjDd6hUTN0CX4zA FXFPFP6NLtPdZqBDNrdL0fMNu3iyxHoT8oDqI56A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Murphy , Florian Fainelli , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 236/266] net: marvell: Fix OF_MDIO config check Date: Wed, 17 Jun 2020 21:16:01 -0400 Message-Id: <20200618011631.604574-236-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618011631.604574-1-sashal@kernel.org> References: <20200618011631.604574-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index a7796134e3be..91cf1d167263 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. * -- 2.25.1