From patchwork Tue Mar 20 06:45:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 888093 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="kcjKVhmU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4053Nh5Dfmz9sYP for ; Tue, 20 Mar 2018 17:45:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751464AbeCTGpz (ORCPT ); Tue, 20 Mar 2018 02:45:55 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36661 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888AbeCTGpv (ORCPT ); Tue, 20 Mar 2018 02:45:51 -0400 Received: by mail-wm0-f65.google.com with SMTP id x82so1259920wmg.1 for ; Mon, 19 Mar 2018 23:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=MwcFgwR7as7Yo21CbeJ9+Rb6JYe2Rq3qFLZTqF1yguo=; b=kcjKVhmUwaXD8VhdYkUrzh4fGJLbo9Czcp8Tx3Y6f5b08U/kt5UcVbnFfEWRvYwjoc BBgoF9wtsnaI8T2yItoDqP9tAUeKNa+obJSR8JTZPkffh29vJIpkN12NgOkFItztfjIo F/XWX7iWzCILmzTWzBhzVD7Rl8+4BvFmUUR3ht45fVfadlYLICKve5qMsrwTCbwIQo2Q CN5B0voOLAn4HImndcP/PVsBbPhNqs1eVLV23r1fvI94Y8SfJO7GuX/GzhGktHLRdpYP BM3/zVTjWbMFAvtz1Idm1g2zyz4EW0kxn9exnLt/iPQykZhingL9PA3N2oZV58NUgglZ 3VnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=MwcFgwR7as7Yo21CbeJ9+Rb6JYe2Rq3qFLZTqF1yguo=; b=WApOD/jCpWB/ZxOjiPDtUC4w0ZIaZlUSsuzgNMFI734WP2QD89O6L8bG7WcTXS07qT ngynIeglFhg91ujNverCJG+AHSxWCupiFWbf/h000/e7p/mtXEoDJ14iJF8oDvQ4G9zb vlMhls2npJGDlk0oeNHbW+TqyWWWK64kDUZrQ2IWLu1mrm2dkx0UvNa+hcega4zaJBc1 XB+ZXsj+4zFb62LQrI/T3fvP7uZKHATS2jVYz9g1gqkTrJMPFjBLITPquZrXLoS0VOFW otsJHx8AqU02Hkbl4/RbXYxxl8ZAlYnbddECINCiRWMealiZJOsMRXMjSGiv4Y4/RasL Pf8A== X-Gm-Message-State: AElRT7GotQJ+k76EMfzT8alz83JZKAy913GcCtL5hcifXopYAQ2MAEer HGd2D/qHJR7ggJJq6bTvKbgOFw== X-Google-Smtp-Source: AG47ELuKwVt1nnqwkEcpx83aElE56T9x1EhG/BrVFTK8b/3w+6gI8fBdZXKGGoqsWWlPvWQ+oQ0bqQ== X-Received: by 10.80.175.70 with SMTP id g64mr16328734edd.131.1521528349709; Mon, 19 Mar 2018 23:45:49 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f8b2:3dd3:75ea:91a8? (p200300EA8BD43D00F8B23DD375EA91A8.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f8b2:3dd3:75ea:91a8]) by smtp.googlemail.com with ESMTPSA id b10sm1274237edj.73.2018.03.19.23.45.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 23:45:49 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH net-next 3/4] r8169: change type of argument in rtl_disable/enable_clock_request To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Tue, 20 Mar 2018 07:45:40 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Changing the argument type to struct rtl8169_private * is more in line with the other functions in the driver and it allows to reduce the code size. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index c67760b7..47a30eab 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -5685,15 +5685,15 @@ static void rtl_ephy_init(struct rtl8169_private *tp, const struct ephy_info *e, } } -static void rtl_disable_clock_request(struct pci_dev *pdev) +static void rtl_disable_clock_request(struct rtl8169_private *tp) { - pcie_capability_clear_word(pdev, PCI_EXP_LNKCTL, + pcie_capability_clear_word(tp->pci_dev, PCI_EXP_LNKCTL, PCI_EXP_LNKCTL_CLKREQ_EN); } -static void rtl_enable_clock_request(struct pci_dev *pdev) +static void rtl_enable_clock_request(struct rtl8169_private *tp) { - pcie_capability_set_word(pdev, PCI_EXP_LNKCTL, + pcie_capability_set_word(tp->pci_dev, PCI_EXP_LNKCTL, PCI_EXP_LNKCTL_CLKREQ_EN); } @@ -5745,8 +5745,6 @@ static void rtl_hw_start_8168bef(struct rtl8169_private *tp) static void __rtl_hw_start_8168cp(struct rtl8169_private *tp) { - struct pci_dev *pdev = tp->pci_dev; - RTL_W8(tp, Config1, RTL_R8(tp, Config1) | Speed_down); RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en); @@ -5754,7 +5752,7 @@ static void __rtl_hw_start_8168cp(struct rtl8169_private *tp) if (tp->dev->mtu <= ETH_DATA_LEN) rtl_tx_performance_tweak(tp, 0x5 << MAX_READ_REQUEST_SHIFT); - rtl_disable_clock_request(pdev); + rtl_disable_clock_request(tp); RTL_W16(tp, CPlusCmd, RTL_R16(tp, CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK); } @@ -5850,11 +5848,9 @@ static void rtl_hw_start_8168c_4(struct rtl8169_private *tp) static void rtl_hw_start_8168d(struct rtl8169_private *tp) { - struct pci_dev *pdev = tp->pci_dev; - rtl_csi_access_enable_2(tp); - rtl_disable_clock_request(pdev); + rtl_disable_clock_request(tp); RTL_W8(tp, MaxTxPacketSize, TxPacketMax); @@ -5866,8 +5862,6 @@ static void rtl_hw_start_8168d(struct rtl8169_private *tp) static void rtl_hw_start_8168dp(struct rtl8169_private *tp) { - struct pci_dev *pdev = tp->pci_dev; - rtl_csi_access_enable_1(tp); if (tp->dev->mtu <= ETH_DATA_LEN) @@ -5875,12 +5869,11 @@ static void rtl_hw_start_8168dp(struct rtl8169_private *tp) RTL_W8(tp, MaxTxPacketSize, TxPacketMax); - rtl_disable_clock_request(pdev); + rtl_disable_clock_request(tp); } static void rtl_hw_start_8168d_4(struct rtl8169_private *tp) { - struct pci_dev *pdev = tp->pci_dev; static const struct ephy_info e_info_8168d_4[] = { { 0x0b, 0x0000, 0x0048 }, { 0x19, 0x0020, 0x0050 }, @@ -5895,12 +5888,11 @@ static void rtl_hw_start_8168d_4(struct rtl8169_private *tp) rtl_ephy_init(tp, e_info_8168d_4, ARRAY_SIZE(e_info_8168d_4)); - rtl_enable_clock_request(pdev); + rtl_enable_clock_request(tp); } static void rtl_hw_start_8168e_1(struct rtl8169_private *tp) { - struct pci_dev *pdev = tp->pci_dev; static const struct ephy_info e_info_8168e_1[] = { { 0x00, 0x0200, 0x0100 }, { 0x00, 0x0000, 0x0004 }, @@ -5926,7 +5918,7 @@ static void rtl_hw_start_8168e_1(struct rtl8169_private *tp) RTL_W8(tp, MaxTxPacketSize, TxPacketMax); - rtl_disable_clock_request(pdev); + rtl_disable_clock_request(tp); /* Reset tx FIFO pointer */ RTL_W32(tp, MISC, RTL_R32(tp, MISC) | TXPLA_RST); @@ -5937,7 +5929,6 @@ static void rtl_hw_start_8168e_1(struct rtl8169_private *tp) static void rtl_hw_start_8168e_2(struct rtl8169_private *tp) { - struct pci_dev *pdev = tp->pci_dev; static const struct ephy_info e_info_8168e_2[] = { { 0x09, 0x0000, 0x0080 }, { 0x19, 0x0000, 0x0224 } @@ -5961,7 +5952,7 @@ static void rtl_hw_start_8168e_2(struct rtl8169_private *tp) RTL_W8(tp, MaxTxPacketSize, EarlySize); - rtl_disable_clock_request(pdev); + rtl_disable_clock_request(tp); RTL_W32(tp, TxConfig, RTL_R32(tp, TxConfig) | TXCFG_AUTO_FIFO); RTL_W8(tp, MCU, RTL_R8(tp, MCU) & ~NOW_IS_OOB); @@ -5976,8 +5967,6 @@ static void rtl_hw_start_8168e_2(struct rtl8169_private *tp) static void rtl_hw_start_8168f(struct rtl8169_private *tp) { - struct pci_dev *pdev = tp->pci_dev; - rtl_csi_access_enable_2(tp); rtl_tx_performance_tweak(tp, 0x5 << MAX_READ_REQUEST_SHIFT); @@ -5995,7 +5984,7 @@ static void rtl_hw_start_8168f(struct rtl8169_private *tp) RTL_W8(tp, MaxTxPacketSize, EarlySize); - rtl_disable_clock_request(pdev); + rtl_disable_clock_request(tp); RTL_W32(tp, TxConfig, RTL_R32(tp, TxConfig) | TXCFG_AUTO_FIFO); RTL_W8(tp, MCU, RTL_R8(tp, MCU) & ~NOW_IS_OOB);