hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/arch/alpha/include/asm/io.h
....@@ -7,7 +7,6 @@
77 #include <linux/kernel.h>
88 #include <linux/mm.h>
99 #include <asm/compiler.h>
10
-#include <asm/pgtable.h>
1110 #include <asm/machvec.h>
1211 #include <asm/hwrpb.h>
1312
....@@ -93,11 +92,6 @@
9392
9493 #define page_to_phys(page) page_to_pa(page)
9594
96
-static inline dma_addr_t __deprecated isa_page_to_bus(struct page *page)
97
-{
98
- return page_to_phys(page);
99
-}
100
-
10195 /* Maximum PIO space address supported? */
10296 #define IO_SPACE_LIMIT 0xffff
10397
....@@ -156,9 +150,9 @@
156150 alpha_mv.mv_##NAME(b, addr); \
157151 }
158152
159
-REMAP1(unsigned int, ioread8, /**/)
160
-REMAP1(unsigned int, ioread16, /**/)
161
-REMAP1(unsigned int, ioread32, /**/)
153
+REMAP1(unsigned int, ioread8, const)
154
+REMAP1(unsigned int, ioread16, const)
155
+REMAP1(unsigned int, ioread32, const)
162156 REMAP1(u8, readb, const volatile)
163157 REMAP1(u16, readw, const volatile)
164158 REMAP1(u32, readl, const volatile)
....@@ -288,20 +282,8 @@
288282 return IO_CONCAT(__IO_PREFIX,ioremap) (port, size);
289283 }
290284
291
-static inline void __iomem *__ioremap(unsigned long port, unsigned long size,
292
- unsigned long flags)
293
-{
294
- return ioremap(port, size);
295
-}
296
-
297
-static inline void __iomem * ioremap_nocache(unsigned long offset,
298
- unsigned long size)
299
-{
300
- return ioremap(offset, size);
301
-}
302
-
303
-#define ioremap_wc ioremap_nocache
304
-#define ioremap_uc ioremap_nocache
285
+#define ioremap_wc ioremap
286
+#define ioremap_uc ioremap
305287
306288 static inline void iounmap(volatile void __iomem *addr)
307289 {
....@@ -325,7 +307,7 @@
325307 */
326308
327309 #if IO_CONCAT(__IO_PREFIX,trivial_io_bw)
328
-extern inline unsigned int ioread8(void __iomem *addr)
310
+extern inline unsigned int ioread8(const void __iomem *addr)
329311 {
330312 unsigned int ret;
331313 mb();
....@@ -334,7 +316,7 @@
334316 return ret;
335317 }
336318
337
-extern inline unsigned int ioread16(void __iomem *addr)
319
+extern inline unsigned int ioread16(const void __iomem *addr)
338320 {
339321 unsigned int ret;
340322 mb();
....@@ -377,7 +359,7 @@
377359 #endif
378360
379361 #if IO_CONCAT(__IO_PREFIX,trivial_io_lq)
380
-extern inline unsigned int ioread32(void __iomem *addr)
362
+extern inline unsigned int ioread32(const void __iomem *addr)
381363 {
382364 unsigned int ret;
383365 mb();
....@@ -556,8 +538,6 @@
556538 #define writew_relaxed writew
557539 #define writel_relaxed writel
558540 #define writeq_relaxed writeq
559
-
560
-#define mmiowb()
561541
562542 /*
563543 * String version of IO memory access ops: