From patchwork Sat Nov 5 13:04:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 9413665 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A4DDC6022E for ; Sat, 5 Nov 2016 13:05:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96AC52994F for ; Sat, 5 Nov 2016 13:05:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B4452996F; Sat, 5 Nov 2016 13:05:42 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C412B29952 for ; Sat, 5 Nov 2016 13:05:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c30fD-0003MJ-Kz; Sat, 05 Nov 2016 13:05:39 +0000 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c30f8-0002XM-Rx for linux-rockchip@lists.infradead.org; Sat, 05 Nov 2016 13:05:36 +0000 Received: by mail-lf0-x243.google.com with SMTP id o141so4888327lff.1 for ; Sat, 05 Nov 2016 06:05:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MhxH6ltP+wJ9Da94u8J7EbzEAfuOcQ7pZiBkVXZNvPo=; b=Tj9VuSlA8wIYEf2nhSFbgzCw6ZVn58uFwXLkyuXFmJyT/w5RB2sPy+FI7s8w7mRdcH nCvrZZJIq3ENSwaA6YAcRGXXZyfmJKaQKWzM5ezkk2ygikiLfkggVGCapRRldOOomCve tYnigkvV9ucLgTIAjWWl5s6kkQUa4/SSD6QI4JQSKBzGcSBX1Kr/fLIqnZsoi1ZwKTEB RON00/Q81XrcRtdtBxE9f3BEC09xBwLox3ZJV0x9Tsn90A/MbigRqg6sl1b1yOXyA+28 uKzcDwGrmVIx2uCpB4RFLK9KjH0UyioIHGzuORSFZCUiX3KvcuvPVlWDr9YcW79ATpAF sndQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MhxH6ltP+wJ9Da94u8J7EbzEAfuOcQ7pZiBkVXZNvPo=; b=m6jkvgAgrlgEFnj9SkQhbLmwFj/y3itCHm0qpKTqKYe37oy8h8Dp9bU+WofjvktpgS 0zLtEqxIbXlyKZm8L6FEihsQ/I28d6vpfcCIa+rDci4zVr9k4nJ5iHBfgYFQPB2kav9D lKYnOg60xwBFLF+uq+FXsIqx5XM4KbF/Bt8tpjr8+sy71zlqbv2qJVgZNn4uvnOnhbJN UEj90aswLQlhTkZSjsrsCLalmBR1gkz4eDU2SR43AZO+hWG7bJSAQVeJ17KmHUtJcMTW GoGL4Q0Mc+MiP7RAPyMzUGxyWNp/XWRN23FtSWM+gb5ihaEIFZYK0dlgn01EXXcKbPAO j2TA== X-Gm-Message-State: ABUngve63ngctfSoSSBEUmvrINpGT89MZ0YsaTGFuQ79ek/CWE+k7Nplrzcdi+VOTf/Ycg== X-Received: by 10.25.201.1 with SMTP id z1mr12050156lff.6.1478351114839; Sat, 05 Nov 2016 06:05:14 -0700 (PDT) Received: from archthink.lan (244.89-11-254.nextgentel.com. [89.11.254.244]) by smtp.gmail.com with ESMTPSA id p3sm3221994lfe.1.2016.11.05.06.05.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Nov 2016 06:05:14 -0700 (PDT) From: Joachim Eastwood To: davem@davemloft.net Subject: [PATCH net-next 3/4] stmmac: dwmac-rk: absorb rk_gmac_init into probe Date: Sat, 5 Nov 2016 14:04:51 +0100 Message-Id: <20161105130452.24226-4-manabian@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161105130452.24226-1-manabian@gmail.com> References: <20161105130452.24226-1-manabian@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161105_060535_221872_CEA3E5EB X-CRM114-Status: UNSURE ( 9.03 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vpalatin@chromium.org, heiko@sntech.de, netdev@vger.kernel.org, Joachim Eastwood , linux-rockchip@lists.infradead.org, peppe.cavallaro@st.com MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since the rk_gmac_init() only calls another function move this function call into probe so rk_gmac_init() can be removed. Since commit cecbc5563a02 ("stmmac: allow to split suspend/resume from init/exit callbacks") the init hook is no longer used in dwmac-rk so this can be removed. Signed-off-by: Joachim Eastwood --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 8506881..6b787d7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -901,13 +901,6 @@ static void rk_gmac_powerdown(struct rk_priv_data *gmac) gmac_clk_enable(gmac, false); } -static int rk_gmac_init(struct platform_device *pdev, void *priv) -{ - struct rk_priv_data *bsp_priv = priv; - - return rk_gmac_powerup(bsp_priv); -} - static void rk_fix_speed(void *priv, unsigned int speed) { struct rk_priv_data *bsp_priv = priv; @@ -943,14 +936,13 @@ static int rk_gmac_probe(struct platform_device *pdev) return PTR_ERR(plat_dat); plat_dat->has_gmac = true; - plat_dat->init = rk_gmac_init; plat_dat->fix_mac_speed = rk_fix_speed; plat_dat->bsp_priv = rk_gmac_setup(pdev, data); if (IS_ERR(plat_dat->bsp_priv)) return PTR_ERR(plat_dat->bsp_priv); - ret = rk_gmac_init(pdev, plat_dat->bsp_priv); + ret = rk_gmac_powerup(plat_dat->bsp_priv); if (ret) return ret;