Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba69a3d7 authored by Varka Bhadram's avatar Varka Bhadram Committed by David S. Miller
Browse files

ethernet: amd: fix pci device ids 



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: default avatarVarka Bhadram <varkab@cdac.in>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13a4fa43

drivers/net/ethernet/amd/amd8111e.c

+11 −9
Original line number Diff line number Diff line
@@ -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,14 +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. */

static int amd8111e_read_phy(struct amd8111e_priv* lp, int phy_id, int reg, u32* val)

{
@@ -1953,6 +1944,17 @@ static void amd8111e_remove_one(struct pci_dev *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,