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 --- flashrom.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 4c6c1fa..cfb8e5f 100644 --- a/flashrom.c +++ b/flashrom.c @@ -61,7 +61,6 @@ enum programmer programmer = #endif #if CONFIG_NICREALTEK == 1 PROGRAMMER_NICREALTEK - PROGRAMMER_NICREALTEK2 #endif #if CONFIG_NICNATSEMI == 1 PROGRAMMER_NICNATSEMI @@ -182,7 +181,9 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_NICREALTEK == 1 { + /* This programmer works for Realtek RTL8139 and SMC 1211. */ .name = "nicrealtek", + //.name = "nicsmc1211", .init = nicrealtek_init, .shutdown = nicrealtek_shutdown, .map_flash_region = fallback_map, @@ -197,22 +198,6 @@ const struct programmer_entry programmer_table[] = { .chip_writen = fallback_chip_writen, .delay = internal_delay, }, - { - .name = "nicsmc1211", - .init = nicsmc1211_init, - .shutdown = nicrealtek_shutdown, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .chip_readb = nicrealtek_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = nicrealtek_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, - .delay = internal_delay, - }, #endif #if CONFIG_NICNATSEMI == 1 -- cgit v1.1