diff options
| author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-08-14 15:48:44 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-08-14 15:48:44 +0000 |
| commit | 7fb5aa049bee3c685835dc24c8184c5897e4a6bd (patch) | |
| tree | 3d193e98d25da24307824ab8d0939f3538ec2e50 /gfxnvidia.c | |
| parent | 36e9f4b3595c6e8b13f80f85785a91b65ecad62f (diff) | |
| download | ast2050-flashrom-7fb5aa049bee3c685835dc24c8184c5897e4a6bd.zip ast2050-flashrom-7fb5aa049bee3c685835dc24c8184c5897e4a6bd.tar.gz | |
Automatically unmap physmap()s
Similarly to the previous PCI self-clean up patch this one allows to get rid
of a huge number of programmer shutdown functions and makes introducing
bugs harder. It adds a new function rphysmap() that takes care of unmapping
at shutdown. Callers are changed where it makes sense.
Corresponding to flashrom svn r1714.
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 | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gfxnvidia.c b/gfxnvidia.c index d0a9feb..8f3aa44 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -77,12 +77,6 @@ static const struct par_programmer par_programmer_gfxnvidia = { .chip_writen = fallback_chip_writen, }; -static int gfxnvidia_shutdown(void *data) -{ - physunmap(nvidia_bar, GFXNVIDIA_MEMMAP_SIZE); - return 0; -} - int gfxnvidia_init(void) { struct pci_dev *dev = NULL; @@ -99,9 +93,8 @@ int gfxnvidia_init(void) io_base_addr += 0x300000; msg_pinfo("Detected NVIDIA I/O base address: 0x%x.\n", io_base_addr); - nvidia_bar = physmap("NVIDIA", io_base_addr, GFXNVIDIA_MEMMAP_SIZE); - - if (register_shutdown(gfxnvidia_shutdown, NULL)) + nvidia_bar = rphysmap("NVIDIA", io_base_addr, GFXNVIDIA_MEMMAP_SIZE); + if (nvidia_bar == ERROR_PTR) return 1; /* Allow access to flash interface (will disable screen). */ |
