summaryrefslogtreecommitdiff
path: root/drivers/video/bochs/bochs_hw.h
diff options
context:
space:
mode:
authorDenis Orlov <denorl2009@gmail.com>2023-05-11 15:47:43 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2023-05-12 13:15:02 +0200
commitd1c0a7d209f993897ee15427c5e63d59bfbec814 (patch)
treea53d854244f12a07402fd4961743f3fc1c9a48cb /drivers/video/bochs/bochs_hw.h
parent471bcd0593706be3c0a711365b6dcd70d416ba11 (diff)
downloadbarebox-d1c0a7d209f993897ee15427c5e63d59bfbec814.tar.gz
video: bochs: fix IOMEM usage
For the PCI version of the driver, we end up calling IOMEM() twice on both the fb_map and mmio pointers. This happens because we first use pci_iomap() on PCI resources in the bochs_pci_probe() and then explicitly call IOMEM() in the bochs_hw_probe(). However, judging from the parameters of the latter function having __iomem attributes, we should not be remapping them. So, remove those IOMEM calls and instead do explicit remapping in bochs_isa_detect(), which was missing it. Also fix bochs_hw_probe() declaration missing one __iomem. Signed-off-by: Denis Orlov <denorl2009@gmail.com> Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.barebox.org/20230511124743.2878952-1-denorl2009@gmail.com Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/video/bochs/bochs_hw.h')
-rw-r--r--drivers/video/bochs/bochs_hw.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/bochs/bochs_hw.h b/drivers/video/bochs/bochs_hw.h
index e01ef13d47..c721113656 100644
--- a/drivers/video/bochs/bochs_hw.h
+++ b/drivers/video/bochs/bochs_hw.h
@@ -10,6 +10,6 @@
struct device;
-int bochs_hw_probe(struct device *dev, void *fb_map, void __iomem *mmio);
+int bochs_hw_probe(struct device *dev, void __iomem *fb_map, void __iomem *mmio);
#endif