device-dax: make pgmap optional for instance creation

[linux-2.6-microblaze.git] / drivers / dax / kmem.c

diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c
index 275aa5f..5bb133d 100644 (file)
--- a/drivers/dax/kmem.c
+++ b/drivers/dax/kmem.c
@@ -22,7 +22,7 @@ static bool any_hotremove_failed;
 int dev_dax_kmem_probe(struct device *dev)
 {
        struct dev_dax *dev_dax = to_dev_dax(dev);
-       struct resource *res = &dev_dax->region->res;
+       struct range *range = &dev_dax->range;
        resource_size_t kmem_start;
        resource_size_t kmem_size;
        resource_size_t kmem_end;
@@ -39,17 +39,17 @@ int dev_dax_kmem_probe(struct device *dev)
         */
        numa_node = dev_dax->target_node;
        if (numa_node < 0) {
-               dev_warn(dev, "rejecting DAX region %pR with invalid node: %d\n",
-                        res, numa_node);
+               dev_warn(dev, "rejecting DAX region with invalid node: %d\n",
+                               numa_node);
                return -EINVAL;
        }
 
        /* Hotplug starting at the beginning of the next block: */
-       kmem_start = ALIGN(res->start, memory_block_size_bytes());
+       kmem_start = ALIGN(range->start, memory_block_size_bytes());
 
-       kmem_size = resource_size(res);
+       kmem_size = range_len(range);
        /* Adjust the size down to compensate for moving up kmem_start: */
-       kmem_size -= kmem_start - res->start;
+       kmem_size -= kmem_start - range->start;
        /* Align the size down to cover only complete blocks: */
        kmem_size &= ~(memory_block_size_bytes() - 1);
        kmem_end = kmem_start + kmem_size;