diff options
author | stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2013-01-04 22:24:58 +0000 |
---|---|---|
committer | stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2013-01-04 22:24:58 +0000 |
commit | fc2c3133fbb24b2e770c6f3bea0a850272a70bbe (patch) | |
tree | 5284fff71cacd837b0bea9b80977dee26a08765a /nicrealtek.c | |
parent | 56db1525df14792574a9847d22eaf1fea09a115e (diff) | |
download | flashrom-fc2c3133fbb24b2e770c6f3bea0a850272a70bbe.tar.gz |
Unify PCI init and let pcidev clean itself up.
Previously the internal programmer used its own code to initialize pcilib.
This patch extracts the common code from the internal programmer and
pcidev_init() into pcidev_init_common().
This fixes the non-existent PCI cleanup of the internal programmer and adds
an additional safety by checking for an already existing PCI context.
We got a nice shutdown function registration infrastructure, but did not use it
very wisely. Instead we added shutdown functions to a myriad of programmers
unnecessarily. In this patch we get rid of those that do only call pci_cleanup(pacc)
by adding a shutdown function the pcidev.c itself that gets registered by
pcidev_init().
Signed-off-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1642 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'nicrealtek.c')
-rw-r--r-- | nicrealtek.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nicrealtek.c b/nicrealtek.c index 3c3b261..8349b42 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -54,7 +54,6 @@ static const struct par_programmer par_programmer_nicrealtek = { static int nicrealtek_shutdown(void *data) { /* FIXME: We forgot to disable software access again. */ - pci_cleanup(pacc); return 0; } @@ -63,8 +62,8 @@ int nicrealtek_init(void) if (rget_io_perms()) return 1; + /* No need to check for errors, pcidev_init() will not return in case of errors. */ io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_realtek); - if (register_shutdown(nicrealtek_shutdown, NULL)) return 1; |