1 files changed, 1 insertions, 34 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index e1ba610482c0..be6c1eb3cbe2 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -448,7 +448,6 @@ void platform_device_del(struct platform_device *pdev)
         int i;
 
         if (!IS_ERR_OR_NULL(pdev)) {
-                device_remove_properties(&pdev->dev);
                 device_del(&pdev->dev);
 
                 if (pdev->id_auto) {
@@ -1138,8 +1137,7 @@ int platform_dma_configure(struct device *dev)
                 ret = of_dma_configure(dev, dev->of_node, true);
         } else if (has_acpi_companion(dev)) {
                 attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode));
-                if (attr != DEV_DMA_NOT_SUPPORTED)
-                        ret = acpi_dma_configure(dev, attr);
+                ret = acpi_dma_configure(dev, attr);
         }
 
         return ret;
@@ -1179,37 +1177,6 @@ int __init platform_bus_init(void)
         return error;
 }
 
-#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK
-static u64 dma_default_get_required_mask(struct device *dev)
-{
-        u32 low_totalram = ((max_pfn - 1) << PAGE_SHIFT);
-        u32 high_totalram = ((max_pfn - 1) >> (32 - PAGE_SHIFT));
-        u64 mask;
-
-        if (!high_totalram) {
-                /* convert to mask just covering totalram */
-                low_totalram = (1 << (fls(low_totalram) - 1));
-                low_totalram += low_totalram - 1;
-                mask = low_totalram;
-        } else {
-                high_totalram = (1 << (fls(high_totalram) - 1));
-                high_totalram += high_totalram - 1;
-                mask = (((u64)high_totalram) << 32) + 0xffffffff;
-        }
-        return mask;
-}
-
-u64 dma_get_required_mask(struct device *dev)
-{
-        const struct dma_map_ops *ops = get_dma_ops(dev);
-
-        if (ops->get_required_mask)
-                return ops->get_required_mask(dev);
-        return dma_default_get_required_mask(dev);
-}
-EXPORT_SYMBOL_GPL(dma_get_required_mask);
-#endif
-
 static __initdata LIST_HEAD(early_platform_driver_list);
 static __initdata LIST_HEAD(early_platform_device_list);