Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp969367ybt; Wed, 17 Jun 2020 19:25:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7vswCxsDOmKXLpS5f7P/3zC9TVrcOr62eTHJHg3Ubb6KRgshXCMxm8Ao6vJ5oPvd07Eno X-Received: by 2002:aa7:c9c9:: with SMTP id i9mr1955556edt.166.1592447154009; Wed, 17 Jun 2020 19:25:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592447154; cv=none; d=google.com; s=arc-20160816; b=Kt3w0cVRBmY6zeQ6YodhFrvu3vq4Dsu0d8Bbl6dLN6a7RUqjH7dE5kSFnWuhYm41mU CoeTas1Cq5Hvl7JPt/UQv0mwUUF8QMpTbpCLGVvqT/DVrC6NmSQatHg4wEPjCSVybAnV q2BlzW3s8uLIvCIHxxm1g0d/AnaORiEiNz1nNWt5vsfGeWheF2BC5kafstJAbgQ+f9nG XHAK5lcLymbCdsqQ7Koe+Nu9fFOirtwOD9m7y1HMVhbtEeVOHjub41NGGCkembZUfSpY lK/vO6v1BbV3UNaEXDBGX5nhf3EscupHVWtqqSOI2+jkwM0iCibpqx1tlJ/w59hCXrGr DZvw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=laqgb9uDbrjCUjscJ8EpfwwIoLjHLxrTVh6BBRVeyME=; b=iLdMw+sIqx9UlGjg56rHh0r6pOt27OIs6dzdi+O9/9dD3urhKFtp6hVzYeHNSnIsy7 gHMAJiLOEyiacn0et66RJRboVUMTb9B1U+cZW8l3K7W8RWx+PFKH/HoBvQzp8oknGU3g mcI8BPO/A42npiqZWGX4C609UMv8dHUQr7NefXUmpnyXAA8TlXyZUSqsFi4weAZs99Nv fsVSZJlQJw4nJr8dvQkT1JZlMgpjmOaUNDctvuPKU7Nj3pntK8Gf9dfHfjlVBWpNvebg Jj5WOho2/LLxVG8siP86T/m2OHt2ba7fMjc0gGxrOJlWvx32/gE12L120VAzNvxokpv6 N5SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cogJLe8C; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y2si1105630edu.320.2020.06.17.19.25.32; Wed, 17 Jun 2020 19:25:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=cogJLe8C; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729296AbgFRBSa (ORCPT + 99 others); Wed, 17 Jun 2020 21:18:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:45660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729487AbgFRBPd (ORCPT ); Wed, 17 Jun 2020 21:15:33 -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 91E0821D79; Thu, 18 Jun 2020 01:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442933; bh=vM6Lnc7iSV1gQ+48IRh6IG8LuG+x2QF739G8EG3STGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cogJLe8CA7pCD2LAdziux70IACbPAQQdN4K9imkQJuhtRfzhzSGJqD3qzW0mP2L5e x+dxHOObFBvsKHh9hGD1FXG7nNc8oYdJZgA1mVZJDG+/1gP61w3HMeade/3yx+wJrg oNqmjX4IG2twh95AdrBM3YwPxVqFauBq0sqnmUTo= 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 346/388] net: mscc: Fix OF_MDIO config check Date: Wed, 17 Jun 2020 21:07:23 -0400 Message-Id: <20200618010805.600873-346-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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Murphy [ Upstream commit ae602786407fef34e1d66b3c8f278a10ed37197e ] 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: 4f58e6dceb0e4 ("net: phy: Cleanup the Edge-Rate feature in Microsemi PHYs.") Signed-off-by: Dan Murphy Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/mscc/mscc.h | 2 +- drivers/net/phy/mscc/mscc_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/mscc/mscc.h b/drivers/net/phy/mscc/mscc.h index 414e3b31bb1f..132f9bf49198 100644 --- a/drivers/net/phy/mscc/mscc.h +++ b/drivers/net/phy/mscc/mscc.h @@ -375,7 +375,7 @@ struct vsc8531_private { #endif }; -#ifdef CONFIG_OF_MDIO +#if IS_ENABLED(CONFIG_OF_MDIO) struct vsc8531_edge_rate_table { u32 vddmac; u32 slowdown[8]; diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c index c8aa6d905d8e..485a4f8a6a9a 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -98,7 +98,7 @@ static const struct vsc85xx_hw_stat vsc8584_hw_stats[] = { }, }; -#ifdef CONFIG_OF_MDIO +#if IS_ENABLED(CONFIG_OF_MDIO) static const struct vsc8531_edge_rate_table edge_table[] = { {MSCC_VDDMAC_3300, { 0, 2, 4, 7, 10, 17, 29, 53} }, {MSCC_VDDMAC_2500, { 0, 3, 6, 10, 14, 23, 37, 63} }, @@ -382,7 +382,7 @@ static void vsc85xx_wol_get(struct phy_device *phydev, mutex_unlock(&phydev->lock); } -#ifdef CONFIG_OF_MDIO +#if IS_ENABLED(CONFIG_OF_MDIO) static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev) { u32 vdd, sd; -- 2.25.1