From patchwork Wed Oct 31 15:08:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 991483 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Gg/Hcy5+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42lWv42q2nz9s3Z for ; Thu, 1 Nov 2018 02:08:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729583AbeKAAHK (ORCPT ); Wed, 31 Oct 2018 20:07:10 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:47015 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728920AbeKAAHJ (ORCPT ); Wed, 31 Oct 2018 20:07:09 -0400 Received: by mail-lf1-f68.google.com with SMTP id o2-v6so11882807lfl.13 for ; Wed, 31 Oct 2018 08:08:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=e5frE0WJ4d8tX8keWMYH6dLS7V4PumD0YzkgOc87U20=; b=Gg/Hcy5+noTBg1aPXPBql0TGm7aVmka1GfD/Vo1kGojY3HYsyfUiMfv+eIu9vjJktQ Ir2zVFwFOpaV0lnm5scoV1NYnHpmMZRJxL2HyHxYIN8tDXxS/R3YDz0HRijxZfNMyeto fEb7F4H9J3SApKheQiC1irCxjobJGVbzQ8E9I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=e5frE0WJ4d8tX8keWMYH6dLS7V4PumD0YzkgOc87U20=; b=pwB6DZsaw7JCqYN2OemL0M3j9gsO5OmpFphVhyiqpuDjKrVg4Pb2yLa/qNRAoa80Pi h92Y+ytG6auyRYeERdD5wk/EunvWsvcGKv288cfrjgBrxq63YM8jyMJKiPMu7hhnVLxk y5u4KNnLHDasDp5zI90wsN6/XqSNCHkn7KQiHBruGN00/H15BYnY1bzhYQpdMZyzCfpY S/PP22LhJyPqivzMR09Z2BA4Vbtys78InXBkrySMeQzKkfaE0sEie0TJiBMC3SNaIEy3 YJJpEWrDN6uCETDJkEjvEr4ro1oqy3od3QlM9lOq9kyG8pQxxcfuS/NXndZBP4vmzPZD wsoA== X-Gm-Message-State: AGRZ1gJ9NmGWulssw61mw6yH1VV8rgLbS0HXwahfMYyPJO7Us0JQ95IX JTk3aBxU6ePe/RcA1AmkLcnd+w== X-Google-Smtp-Source: AJdET5e2aEfuu9h9V0EqP2gHQwPP1MHSXWGVK52IntXUL/smNjv821MneACQUglaQOKsX9n/RypJCg== X-Received: by 2002:a19:d145:: with SMTP id i66mr2158515lfg.97.1540998515293; Wed, 31 Oct 2018 08:08:35 -0700 (PDT) Received: from centauri.lan (h-229-118.A785.priv.bahnhof.se. [5.150.229.118]) by smtp.gmail.com with ESMTPSA id o72sm4281690lfg.33.2018.10.31.08.08.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Oct 2018 08:08:34 -0700 (PDT) From: Niklas Cassel To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Maxime Coquelin Cc: vkoul@kernel.org, Niklas Cassel , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: stmmac: Fix stmmac_mdio_reset() when building stmmac as modules Date: Wed, 31 Oct 2018 16:08:10 +0100 Message-Id: <20181031150810.16665-1-niklas.cassel@linaro.org> X-Mailer: git-send-email 2.17.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When building stmmac, it is only possible to select CONFIG_DWMAC_GENERIC, or any of the glue drivers, when CONFIG_STMMAC_PLATFORM is set. The only exception is CONFIG_STMMAC_PCI. When calling of_mdiobus_register(), it will call our ->reset() callback, which is set to stmmac_mdio_reset(). Most of the code in stmmac_mdio_reset() is protected by a "#if defined(CONFIG_STMMAC_PLATFORM)", which will evaluate to false when CONFIG_STMMAC_PLATFORM=m. Because of this, the phy reset gpio will only be pulled when stmmac is built as built-in, but not when built as modules. Fix this by using "#if IS_ENABLED()" instead of "#if defined()". Signed-off-by: Niklas Cassel --- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index b72ef171477e..bdd351597b55 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c @@ -243,7 +243,7 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg, */ int stmmac_mdio_reset(struct mii_bus *bus) { -#if defined(CONFIG_STMMAC_PLATFORM) +#if IS_ENABLED(CONFIG_STMMAC_PLATFORM) struct net_device *ndev = bus->priv; struct stmmac_priv *priv = netdev_priv(ndev); unsigned int mii_address = priv->hw->mii.addr;