From patchwork Fri May 5 19:47:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98715 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293225qge; Fri, 5 May 2017 12:49:39 -0700 (PDT) X-Received: by 10.98.148.2 with SMTP id m2mr19197355pfe.28.1494013779802; Fri, 05 May 2017 12:49:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y32si6309907plh.238.2017.05.05.12.49.39; Fri, 05 May 2017 12:49:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755968AbdEETti (ORCPT + 6 others); Fri, 5 May 2017 15:49:38 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:52664 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755479AbdEETs5 (ORCPT ); Fri, 5 May 2017 15:48:57 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXi7y-1dav1h1DPy-00WU2d; Fri, 05 May 2017 21:48:27 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Varka Bhadram , "David S . Miller" , Arnd Bergmann Subject: [PATCH 3.16-stable 54/87] ethernet: amd: fix pci device ids Date: Fri, 5 May 2017 21:47:12 +0200 Message-Id: <20170505194745.3627137-55-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:3d4fQn0NTqDGG9Lo9YxdMKLcUNVvWUD24AEnfEfQrIBvNPlbbzO H2MFMYNlwDXdReEZBGCi1Y+hwCF+oAXs3NZU2c8bgu6/VObWCyxLp44WKg1cZsGQEXjvtUR 628trH+VPwSjKjU8gStVmoPQVb9dM+690KCnO1/2pse6//LOLCXCIuJ5mUkABgGs3CLt0ii vSfvfSiwFuYldg9uMipgg== X-UI-Out-Filterresults: notjunk:1; V01:K0:N/n89qGAnw0=:CEx7UhQ8Y4/utJlr1ovZfj ADgKlQY110JmwX2dYLGwOw8XDCD2QpbEFDBeJJmwC9KmVlNzJynh8XtSjDYQyKAEqKYX31+Rs 3jI3e6ta6Lu7K/QjdEwHQ8Vk9EHwSnkW+qAMrSwlQ7oddUBlXxFD77bLnU7KyBvSqAbGZ1zbn coDB9vh+Lu6ZdYJzyH9eO59iHDHwZL0eovoANoZVthH+L83gH86+T14nOCR0NwptvqnZfevN8 GfpUW0PAk8O+/S3rMkQXoNxccQAc7ogEYGIypZPFqeoUK2AHEjaUl8HaEeXPCT9JgRnOJd/Wu Sje+X7C5w6HPSPJWFIPW7QgrRg3QOjPMrDJHpHi238tsPB0ey8ru7sHUZ1F37RMHLJIi+AmEc pFPTM/bXeNCIcJ7K8udxBfJ9pXMnJ8fJ/lncLWYqz7wp2veLqakvMrlmyH9prJEH4oY7wpSoa ns+CAJ+Txfu9yC7k1KKzL1GTxTbx7X4LhXizv0k4VyFIpzN5EajLTQS7x9C6EkeRjydAeiVHu 5X70B5QlSZsIMksndqVQyben8tklbB7P7g+TYYGHRE7KXvcpNRCEcxdhMHUgtbWxrCcvAZ/iN rjssQzPYdYJlZ7Rdza4fdfvRsat60dYsyl2iqC9FT9Lgj7F27dCPy8SxNECaTuV1MJYrayRhP TaZ6f3dLAzY+Kl58rKX0C6SXTpZBCUIhKRkkfN3O2lFVxbar5nsMzuvCo4od10+rvmvM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Varka Bhadram Commit ba69a3d78e4f51e65933a86b8b107c86709bb2f5 upstream. Normally any device ids will be above the corresponding device driver structure. This patch moves the pci device ids and MODULE_DEVICE_TABLE() above the pci driver structure. Signed-off-by: Varka Bhadram Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/amd/amd8111e.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index 068dc7cad5fa..47b34f7c4512 100644 --- a/drivers/net/ethernet/amd/amd8111e.c +++ b/drivers/net/ethernet/amd/amd8111e.c @@ -101,7 +101,6 @@ Revision History: MODULE_AUTHOR("Advanced Micro Devices, Inc."); MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version "MODULE_VERS); MODULE_LICENSE("GPL"); -MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl); module_param_array(speed_duplex, int, NULL, 0); MODULE_PARM_DESC(speed_duplex, "Set device speed and duplex modes, 0: Auto Negotiate, 1: 10Mbps Half Duplex, 2: 10Mbps Full Duplex, 3: 100Mbps Half Duplex, 4: 100Mbps Full Duplex"); module_param_array(coalesce, bool, NULL, 0); @@ -109,13 +108,6 @@ MODULE_PARM_DESC(coalesce, "Enable or Disable interrupt coalescing, 1: Enable, 0 module_param_array(dynamic_ipg, bool, NULL, 0); MODULE_PARM_DESC(dynamic_ipg, "Enable or Disable dynamic IPG, 1: Enable, 0: Disable"); -static DEFINE_PCI_DEVICE_TABLE(amd8111e_pci_tbl) = { - - { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD8111E_7462, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, - { 0, } - -}; /* This function will read the PHY registers. */ @@ -1970,6 +1962,17 @@ err_disable_pdev: } +static const struct pci_device_id amd8111e_pci_tbl[] = { + { + .vendor = PCI_VENDOR_ID_AMD, + .device = PCI_DEVICE_ID_AMD8111E_7462, + }, + { + .vendor = 0, + } +}; +MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl); + static struct pci_driver amd8111e_driver = { .name = MODULE_NAME, .id_table = amd8111e_pci_tbl,