From patchwork Sat Jan 19 21:07:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1028064 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="h1GyiZ5I"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43hr4d2cY2z9sDr for ; Sun, 20 Jan 2019 08:08:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729622AbfASVH7 (ORCPT ); Sat, 19 Jan 2019 16:07:59 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:36826 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729527AbfASVH5 (ORCPT ); Sat, 19 Jan 2019 16:07:57 -0500 Received: by mail-wr1-f66.google.com with SMTP id u4so19059952wrp.3 for ; Sat, 19 Jan 2019 13:07:55 -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=atuw6ixVvmIoPWMjaDlbJkanaH2G4/cVJ7MdwvEZ8bg=; b=h1GyiZ5I3mZKIm+FEjpyVYAQP4QfpJ8A0D/WWIgDumJEWZ/g9KOXzFXSfluf61X5zO luD6M0U6jb+x7CzgooRq7hIDkBM8hF/I6o7YEBBvPyyvpOOXypNi0LPSxge5RGl1gby4 VVfYBqbU2rP6LDtahDLMZksUekM4Urod98DrdojuUdoCCzD3QpC1i4S5Q+kZ/Cef19gf FFacCPfQDk/dGFWIFpYZgzvQCqrWSdmzX4PQDYi3J/qBzjSpy3ZCpimwSHHBinM9Uyoc vD/+VpOaPBYZtGMe7g68eetYtt7Ti59VjF+t+yQoOE+Dj4hasCaCJYdhd+Da+4tSv5xe XP/Q== 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=atuw6ixVvmIoPWMjaDlbJkanaH2G4/cVJ7MdwvEZ8bg=; b=aQTmf9Hq/Ccya7egSwWpTnYEcMJbWIx2s9kbQkD9nykhFJg6UdlVYSvoRuvhyhNE0I u5It/GKhnYhN7X1m/M0TNqQeH4TM5Yn7d7axJLl5rkcF124YNqfCmgwQ3yDc/4PHyeca 9SR3Q2zEEQs2Z6BDo/erwdBs37dfwAj7zNsUDy35HFlGjyh4yZU0odGu6S9aucJUH6dx 1s8Sll8sg6jiEHE2AVXeejQqIsrIqv3NlhmgO5i5wRAnM9TZkiSBsrLSTvounqBPz1Iq 5hy2tTRd1kz16UIc8UEy7ERKOn7Kk7mwYeGQvLuOBdVcG27WR6EsgwY1PuV5pb/j4JuZ RO/g== X-Gm-Message-State: AJcUukeH2vZcAVJUH9KLUrf/A6efrBiPNTtpG7emyu8TBsTmCqN7Tg8B tA7U1K67xuLVK0+fvSyTpzPQqTC3 X-Google-Smtp-Source: ALg8bN5cLcKVHCWd7APvo6OY35hwZSxgdlFtyG3YQZp/Y+yEEsEQ8q4aabefkDLvAiUlTcV793QwAg== X-Received: by 2002:adf:8421:: with SMTP id 30mr22321969wrf.153.1547932074941; Sat, 19 Jan 2019 13:07:54 -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 z17sm69978839wrv.2.2019.01.19.13.07.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 13:07:54 -0800 (PST) Subject: [PATCH net-next v2 8/8] r8169: factor out getting ether_clk From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sat, 19 Jan 2019 22:07:34 +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: Content-Language: en-US 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 07984f7e3..e790a4116 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);