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

Commit 5ec99fdf authored by Cesar Eduardo Barros's avatar Cesar Eduardo Barros Committed by David S. Miller
Browse files

sc92031: use device id directly instead of made-up name 



Instead of making up a name for the device ids, put them directly in the
device id table. Also move the vendor id to pci_ids.h.

Signed-off-by: default avatarCesar Eduardo Barros <cesarb@cesarb.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f08d7c36

drivers/net/sc92031.c

+2 −6
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ 


#include <asm/irq.h>



#define PCI_VENDOR_ID_SILAN		0x1904

#define PCI_DEVICE_ID_SILAN_SC92031	0x2031

#define PCI_DEVICE_ID_SILAN_8139D	0x8139



#define SC92031_NAME "sc92031"



/* BAR 0 is MMIO, BAR 1 is PIO */
@@ -1592,8 +1588,8 @@ out: 
}



static struct pci_device_id sc92031_pci_device_id_table[] __devinitdata = {

	{ PCI_DEVICE(PCI_VENDOR_ID_SILAN, PCI_DEVICE_ID_SILAN_SC92031) },

	{ PCI_DEVICE(PCI_VENDOR_ID_SILAN, PCI_DEVICE_ID_SILAN_8139D) },

	{ PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x2031) },

	{ PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x8139) },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, sc92031_pci_device_id_table);

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -2209,6 +2209,8 @@ 


#define PCI_VENDOR_ID_TOPSPIN		0x1867



#define PCI_VENDOR_ID_SILAN		0x1904



#define PCI_VENDOR_ID_TDI               0x192E

#define PCI_DEVICE_ID_TDI_EHCI          0x0101