From 40446eef1b52599a14b19552f5843302f38c1212 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Mon, 7 Mar 2011 01:08:09 +0000 Subject: Remove vendorid parameter from pcidev_init() Simplify pcidev_init by killing the vendorid parameter which was pretty useless anyway since it was present in the pcidevs parameter as well. This also allows us to handle multiple programmers with different vendor IDs in the same driver. Fix compilation of flashrom with only the nicrealtek driver. Corresponding to flashrom svn r1274. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Michael Karcher --- nicrealtek.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'nicrealtek.c') diff --git a/nicrealtek.c b/nicrealtek.c index c32e5d6..d97deb1 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -32,10 +32,6 @@ const struct pcidev_status nics_realtek[] = { {0x10ec, 0x8139, OK, "Realtek", "RTL8139/8139C/8139C+"}, - {}, -}; - -const struct pcidev_status nics_realteksmc1211[] = { {0x1113, 0x1211, OK, "SMC2", "1211TX"}, /* RTL8139 clone */ {}, }; @@ -44,20 +40,7 @@ int nicrealtek_init(void) { get_io_perms(); - io_base_addr = pcidev_init(PCI_VENDOR_ID_REALTEK, PCI_BASE_ADDRESS_0, - nics_realtek); - - buses_supported = CHIP_BUSTYPE_PARALLEL; - - return 0; -} - -int nicsmc1211_init(void) -{ - get_io_perms(); - - io_base_addr = pcidev_init(PCI_VENDOR_ID_SMC1211, PCI_BASE_ADDRESS_0, - nics_realteksmc1211); + io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_realtek); buses_supported = CHIP_BUSTYPE_PARALLEL; -- cgit v1.1