projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8807236
)
sisfb: delete fallback code for pci_map_rom()
author
Aaro Koskinen
<aaro.koskinen@iki.fi>
Fri, 19 Nov 2010 21:58:44 +0000
(21:58 +0000)
committer
Paul Mundt
<lethal@linux-sh.org>
Wed, 24 Nov 2010 07:02:40 +0000
(16:02 +0900)
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>
drivers/video/sis/sis_main.c
patch
|
blob
|
history
diff --git
a/drivers/video/sis/sis_main.c
b/drivers/video/sis/sis_main.c
index 1073b70dd857997d336aac4ebcd62435b7efae27..7feb6992c7cccc5edc802e125f5de6d9f31dcf7b 100644
(file)
--- 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)
}
}
-#else
-
- pci_read_config_dword(pdev, PCI_ROM_ADDRESS, &temp);
- pci_write_config_dword(pdev, PCI_ROM_ADDRESS,
- (ivideo->video_base & PCI_ROM_ADDRESS_MASK) | PCI_ROM_ADDRESS_ENABLE);
-
- rom_base = ioremap(ivideo->video_base, 65536);
- if(rom_base) {
- if(sisfb_check_rom(rom_base, ivideo)) {
- if((myrombase = vmalloc(65536)))
- memcpy_fromio(myrombase, rom_base, 65536);
- }
- iounmap(rom_base);
- }
-
- pci_write_config_dword(pdev, PCI_ROM_ADDRESS, temp);
-
#endif
return myrombase;
#endif
return myrombase;