diff options
| author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-01-04 22:24:58 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-01-04 22:24:58 +0000 |
| commit | 5561955b1158e8bd29299735abef1e26a5a9cdbc (patch) | |
| tree | 5284fff71cacd837b0bea9b80977dee26a08765a /gfxnvidia.c | |
| parent | 30dfdbaf3ab30974a6d76e085525d52c033e4215 (diff) | |
| download | flashrom-5561955b1158e8bd29299735abef1e26a5a9cdbc.tar.gz flashrom-5561955b1158e8bd29299735abef1e26a5a9cdbc.tar.bz2 flashrom-5561955b1158e8bd29299735abef1e26a5a9cdbc.zip | |
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().
Corresponding to flashrom svn r1642.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'gfxnvidia.c')
| -rw-r--r-- | gfxnvidia.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gfxnvidia.c b/gfxnvidia.c index 624fd7ca..a994d684 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -80,10 +80,6 @@ static const struct par_programmer par_programmer_gfxnvidia = { static int gfxnvidia_shutdown(void *data) { physunmap(nvidia_bar, GFXNVIDIA_MEMMAP_SIZE); - /* Flash interface access is disabled (and screen enabled) automatically - * by PCI restore. - */ - pci_cleanup(pacc); return 0; } @@ -94,6 +90,7 @@ int gfxnvidia_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, gfx_nvidia); io_base_addr += 0x300000; @@ -101,7 +98,6 @@ int gfxnvidia_init(void) nvidia_bar = physmap("NVIDIA", io_base_addr, GFXNVIDIA_MEMMAP_SIZE); - /* Must be done before rpci calls. */ if (register_shutdown(gfxnvidia_shutdown, NULL)) return 1; |