regmap: merge regmap_update_bits_check() into macro

[deliverable/linux.git] / include / linux / io.h

diff --git a/include/linux/io.h b/include/linux/io.h
index de64c1e536125fc30296fba6678e028f9bf7d529..32403b5716e5b8c4a5eb21bfad1f2e4bf7604501 100644 (file)
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -29,6 +29,7 @@ struct device;
 struct resource;
 
 __visible void __iowrite32_copy(void __iomem *to, const void *from, size_t count);
+void __ioread32_copy(void *to, const void __iomem *from, size_t count);
 void __iowrite64_copy(void __iomem *to, const void *from, size_t count);
 
 #ifdef CONFIG_MMU
@@ -89,21 +90,6 @@ void devm_memunmap(struct device *dev, void *addr);
 
 void *__devm_memremap_pages(struct device *dev, struct resource *res);
 
-#ifdef CONFIG_ZONE_DEVICE
-void *devm_memremap_pages(struct device *dev, struct resource *res);
-#else
-static inline void *devm_memremap_pages(struct device *dev, struct resource *res)
-{
-       /*
-        * Fail attempts to call devm_memremap_pages() without
-        * ZONE_DEVICE support enabled, this requires callers to fall
-        * back to plain devm_memremap() based on config
-        */
-       WARN_ON_ONCE(1);
-       return ERR_PTR(-ENXIO);
-}
-#endif
-
 /*
  * Some systems do not have legacy ISA devices.
  * /dev/port is not a valid interface on these systems.