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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham 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 202F6C61CE4 for ; Sat, 19 Jan 2019 20:52:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2B822087E for ; Sat, 19 Jan 2019 20:52:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FM2lgsIk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729579AbfASUwj (ORCPT ); Sat, 19 Jan 2019 15:52:39 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45112 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726773AbfASUwh (ORCPT ); Sat, 19 Jan 2019 15:52:37 -0500 Received: by mail-wr1-f65.google.com with SMTP id t6so18977793wrr.12 for ; Sat, 19 Jan 2019 12:52:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=z3pJFLkHvZQkdJTDA8IPFhrV0U/Tg4h7jmotDdXYRBU=; b=FM2lgsIk/t+0eLyu4U4oPDDbqxRSBqyUJ2dr6eDkMiB3RvbOFDnUGyVY+lsDAiArd5 jWC1TyY0JUVanRqp2845AxTWwIuBQ0YbvkjgYpMdVaylSA8DKDDrRAOQbp1pdehvGKxD vpUqrwSa9Dtw6x2Zhfc/GSwBXQ88lkiSa998hfvR6x80JSewnf0hRfrAVs+IVGiNXKit Hh3QbUbNjlOtoHMcGUhFJ32cJvaD34YZkH5eNNRki181bmjt0g9ERV6gB7lM91SgueID GbQs9/R2Wps4RaAMyvq9aTzPuujRNoMEVjzwHMj+fo5DDFuU+IdUhdewW3XGuLBRGVxi CceA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=z3pJFLkHvZQkdJTDA8IPFhrV0U/Tg4h7jmotDdXYRBU=; b=E/sgKE31tu3vtFyr8C1QLqRFCKJ8SnQ5EmKVc/t4dfTwli/hrP2ONBhm+v3Vhm84tX 0wWvvhMUMFUHVbdUV0zsSdabaciEdZwqMst031BHm9n0Gw3aHEVgQTwtlVRHg8DR+6Ub BXTPKwfn37Bmyw+qMpEtTHPaVYa4niqyiQndlJ37EYkz41rDLJhfPbFAtFRrnlUzLeXm Ckp2aFlH8HZzJDajynt0WjJR4s3hzZUpRFTYeIqUlkBap/cA3GKQ17kuKCmbbRBoaOp1 oyCnq+aNXpGOQXxa/tGXffbaw30O4KDtXSMlOYX66JcoKb3BtEaRCmlAtlbD2p91EK8p ljqA== X-Gm-Message-State: AJcUukf7qWiijWUl5A20aRXnzoa8HCwktWIHfNqf8J+XfqlgEz6RJyvt 6FSjtfrQ7O1Gxq9X1MGIAWuxPULO X-Google-Smtp-Source: ALg8bN6d4v1nYVFpky+QQJNaCROvvvXKjfy2kq2G930JNXZc5fErzbqWQWzOo+56nqlVWiPG4VU2Mw== X-Received: by 2002:adf:e08c:: with SMTP id c12mr20767727wri.199.1547931154923; Sat, 19 Jan 2019 12:52:34 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd? (p200300EA8BF1E200E8778D0CCDF081FD.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd]) by smtp.googlemail.com with ESMTPSA id e17sm69825868wrs.79.2019.01.19.12.52.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 12:52:34 -0800 (PST) Subject: [PATCH net-next 8/8] r8169: factor out getting ether_clk From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <87f4c590-49ff-c3c8-9b64-4cd146e18ac6@gmail.com> Message-ID: Date: Sat, 19 Jan 2019 21:52:13 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <87f4c590-49ff-c3c8-9b64-4cd146e18ac6@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtl_init_one() is complex enough, so we better factor out getting the ether_clk. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 53 +++++++++++++++------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index efb4f670c..358bff12b 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7155,6 +7155,32 @@ static void rtl_disable_clk(void *data) clk_disable_unprepare(data); } +static int rtl_get_ether_clk(struct rtl8169_private *tp) +{ + struct device *d = tp_to_dev(tp); + struct clk *clk; + int rc; + + clk = devm_clk_get(d, "ether_clk"); + if (IS_ERR(clk)) { + rc = PTR_ERR(clk); + if (rc == -ENOENT) + /* clk-core allows NULL (for suspend / resume) */ + rc = 0; + else if (rc != -EPROBE_DEFER) + dev_err(d, "failed to get clk: %d\n", rc); + } else { + tp->clk = clk; + rc = clk_prepare_enable(clk); + if (rc) + dev_err(d, "failed to enable clk: %d\n", rc); + else + rc = devm_add_action_or_reset(d, rtl_disable_clk, clk); + } + + return rc; +} + static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data; @@ -7176,30 +7202,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->supports_gmii = cfg->has_gmii; /* Get the *optional* external "ether_clk" used on some boards */ - tp->clk = devm_clk_get(&pdev->dev, "ether_clk"); - if (IS_ERR(tp->clk)) { - rc = PTR_ERR(tp->clk); - if (rc == -ENOENT) { - /* clk-core allows NULL (for suspend / resume) */ - tp->clk = NULL; - } else if (rc == -EPROBE_DEFER) { - return rc; - } else { - dev_err(&pdev->dev, "failed to get clk: %d\n", rc); - return rc; - } - } else { - rc = clk_prepare_enable(tp->clk); - if (rc) { - dev_err(&pdev->dev, "failed to enable clk: %d\n", rc); - return rc; - } - - rc = devm_add_action_or_reset(&pdev->dev, rtl_disable_clk, - tp->clk); - if (rc) - return rc; - } + rc = rtl_get_ether_clk(tp); + if (rc) + return rc; /* enable device (incl. PCI PM wakeup and hotplug setup) */ rc = pcim_enable_device(pdev); -- 2.20.1