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 2C72AC433E0 for ; Thu, 18 Jun 2020 02:31:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F12A120720 for ; Thu, 18 Jun 2020 02:31:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592447480; bh=8HOfJK/aY0wBjwqxKotd7OQLl1ES1+HHF9/+kdoyKbQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AgQZa5zj4DupFYYMcgEoyPozXkaMVNZPDftQZh0OtQ0DABwUm95gixHcY/2DZJ/ws UU1q0AJuh43oMdMfv2r+XPBM87shCCveGiBiuqRhvYvWmPK10rDWZfKOXWmumISeFp rI5coQR9KafOnVE/JBvucJEfYhmi/NerXnNfo+7Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728590AbgFRBPd (ORCPT ); Wed, 17 Jun 2020 21:15:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:45572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729482AbgFRBPb (ORCPT ); Wed, 17 Jun 2020 21:15:31 -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 E0A872088E; Thu, 18 Jun 2020 01:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442930; bh=8HOfJK/aY0wBjwqxKotd7OQLl1ES1+HHF9/+kdoyKbQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mP0DeQ05FtI2UJv6ebMa+ZPCJyT/YxQAgnOo6pqqQpsKQdT+tYMMo7luVmBX+dRi0 odxY7pW9sPnMG4wfW783NxUDptzO08K4K9G0uamluMHJCPFaGoGT5GuWidi7H/HUOU bT3DSj9C6bkdE2bOd/2on6akAhJ96erubikJr7fM= 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.7 344/388] net: dp83867: Fix OF_MDIO config check Date: Wed, 17 Jun 2020 21:07:21 -0400 Message-Id: <20200618010805.600873-344-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit 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(-) diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c index b55e3c0403ed..ddac79960ea7 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