diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-03-07 01:08:09 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-03-07 01:08:09 +0000 |
| commit | 40446eef1b52599a14b19552f5843302f38c1212 (patch) | |
| tree | 381d046fea47f794966eae15695917e0f19c0eba /nicrealtek.c | |
| parent | c6f71462c90cce60ad9e94d865865acbb12b75bd (diff) | |
| download | ast2050-flashrom-40446eef1b52599a14b19552f5843302f38c1212.zip ast2050-flashrom-40446eef1b52599a14b19552f5843302f38c1212.tar.gz | |
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 <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Diffstat (limited to 'nicrealtek.c')
| -rw-r--r-- | nicrealtek.c | 19 |
1 files changed, 1 insertions, 18 deletions
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; |
