diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2010-11-19 16:58:44 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 02:02:40 -0500 |
| commit | f3fff7359415f3e6331fa727ab27e9a1556ee7e7 (patch) | |
| tree | 5d3f3ec5bd1bba47d9b66f8fb85dcb6e4c41df8b | |
| parent | 8807236b1895b3aca022180cb9906022965344ad (diff) | |
sisfb: delete fallback code for pci_map_rom()
If pci_map_rom() fails, there is some fallback code that basically
duplicates pci_map_rom() on non-x86 platforms. No point in that.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | drivers/video/sis/sis_main.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 1073b70dd857..7feb6992c7cc 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
| @@ -4147,23 +4147,6 @@ sisfb_find_rom(struct pci_dev *pdev) | |||
| 4147 | 4147 | ||
| 4148 | } | 4148 | } |
| 4149 | 4149 | ||
| 4150 | #else | ||
| 4151 | |||
| 4152 | pci_read_config_dword(pdev, PCI_ROM_ADDRESS, &temp); | ||
| 4153 | pci_write_config_dword(pdev, PCI_ROM_ADDRESS, | ||
| 4154 | (ivideo->video_base & PCI_ROM_ADDRESS_MASK) | PCI_ROM_ADDRESS_ENABLE); | ||
| 4155 | |||
| 4156 | rom_base = ioremap(ivideo->video_base, 65536); | ||
| 4157 | if(rom_base) { | ||
| 4158 | if(sisfb_check_rom(rom_base, ivideo)) { | ||
| 4159 | if((myrombase = vmalloc(65536))) | ||
| 4160 | memcpy_fromio(myrombase, rom_base, 65536); | ||
| 4161 | } | ||
| 4162 | iounmap(rom_base); | ||
| 4163 | } | ||
| 4164 | |||
| 4165 | pci_write_config_dword(pdev, PCI_ROM_ADDRESS, temp); | ||
| 4166 | |||
| 4167 | #endif | 4150 | #endif |
| 4168 | 4151 | ||
| 4169 | return myrombase; | 4152 | return myrombase; |
