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: 10662835 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D4AF13BF for ; Wed, 31 Oct 2018 15:09:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B8DE2AF8A for ; Wed, 31 Oct 2018 15:09:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49A142B00F; Wed, 31 Oct 2018 15:09:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 27E7A2AF8A for ; Wed, 31 Oct 2018 15:09:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=/4OK/dPzuQa81CzVyvn1axvH9V/vZCDM5kPAVyUCKI4=; b=e7x R29jmGfBo48hrztB5MEI9h6ir4g2X/R0VZ+0unNFkwfNuXbmiGVHM3/xUSyXVPa9zBK1YqK4Hu+J8 AyKifxXFDOWV9UT+dgp0Hxki+fqgzD9ICiP7VPwaw85qOsOo7HpX+rzS3T2apAbC30L56wr22G8ib g2kaCQB8eWdQp2N2rrUCRIevBOa872eUGsWLKoHOTM9rW/fJ8owZZynKail+PI3sjtixMoCrdjyeG b62HYMqNLOg6y+RtaAU5nbNMHZe55CAHdCEBRgk4frADbv3iyrq4BrRl/7lpV9BHWftXBEWo2mj0i OfjL5GmSe1GmjG8DDX6pqV33aRf5bdw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHs79-0000C6-9Z; Wed, 31 Oct 2018 15:08:59 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHs76-0000AP-Av for linux-arm-kernel@lists.infradead.org; Wed, 31 Oct 2018 15:08:57 +0000 Received: by mail-lf1-x144.google.com with SMTP id d7-v6so11915076lfi.2 for ; Wed, 31 Oct 2018 08:08:45 -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=cIXW7hDeNmzxgcyIza4udvbOqg2qN1DUT+VlDQw4G0KnsO2cAk34WrGJOTEZ2hMkRF O142pdYGLIG2Vobq5nhj94PJhksO0TAxt6tS7tR4SwtZA4qRETTykfkDm31ms0JldfGW FKpG3JGhz7/ltNOIHSlVqDVLAR1r2/kzDwtcEYfv7469Y0Y8JaD9y1pd3cRBN+Z8PQt7 DWDb8f9jqdNf0DV2e1JQBVH4HLf56BMMTPXnlKQi3y7sehmmXGVuR+dqTuQMnfUpkIeR mASZ650YrlIkOyVcZOu0Ck7lZhJrg8zHuFcJ9pqFSvmrOiEx7wmau598iRQO3Dbp9+8N 4C9w== X-Gm-Message-State: AGRZ1gKEo7vy9mXGU5b495gS28vjLBAKel5X5j2Rr/dGCWIbC7iwW0Ek ewBMmwAu53K+CnQXLR8AtmABjA== 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181031_080856_376622_49DFFC15 X-CRM114-Status: GOOD ( 13.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, vkoul@kernel.org, Niklas Cassel , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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;