diff options
| author | Niklas Söderlund <niso@kth.se> | 2013-09-14 09:02:27 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-09-14 09:02:27 +0000 |
| commit | 5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8 (patch) | |
| tree | 1d4a18ad60037ced5824c9f509dd77997f56054a /chipset_enable.c | |
| parent | 2d8b7ef4a84e4946619fa8e4d1b9fcaa15208440 (diff) | |
| download | flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.tar.gz flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.tar.bz2 flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.zip | |
Remove exit call and mayfail parameter from physmap_common()
The only call path where exit was reached was from physmap functions.
Callers of physmap() et al. which were not prepared to handle
ERROR_PTR return values have been adjusted.
physmap_try_ro() has been renamed to physmap_ro() and physmap_common()
slightly refactored due to the now removed *FAIL parameters.
Corresponding to flashrom svn r1745.
Signed-off-by: Niklas Söderlund <niso@kth.se>
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'chipset_enable.c')
| -rw-r--r-- | chipset_enable.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chipset_enable.c b/chipset_enable.c index 50024277e..3db7a8d2a 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -482,7 +482,7 @@ static int enable_flash_tunnelcreek(struct pci_dev *dev, const char *name) /* Map RCBA to virtual memory */ rcrb = rphysmap("ICH RCRB", tmp, 0x4000); if (rcrb == ERROR_PTR) - return 1; + return ERROR_FATAL; /* Test Boot BIOS Strap Status */ bnt = mmio_readl(rcrb + 0x3410); @@ -566,7 +566,7 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name, /* Map RCBA to virtual memory */ rcrb = rphysmap("ICH RCRB", tmp, 0x4000); if (rcrb == ERROR_PTR) - return 1; + return ERROR_FATAL; gcs = mmio_readl(rcrb + 0x3410); msg_pdbg("GCS = 0x%x: ", gcs); @@ -1289,6 +1289,8 @@ static int get_flashbase_sc520(struct pci_dev *dev, const char *name) /* 1. Map MMCR */ mmcr = physmap("Elan SC520 MMCR", 0xfffef000, getpagesize()); + if (mmcr == ERROR_PTR) + return ERROR_FATAL; /* 2. Scan PAR0 (0x88) - PAR15 (0xc4) for * BOOTCS region (PARx[31:29] = 100b)e |