|
@@ -42,7 +42,7 @@ static int nd_region_probe(struct device *dev)
|
|
|
if (rc)
|
|
if (rc)
|
|
|
return rc;
|
|
return rc;
|
|
|
|
|
|
|
|
- if (is_nd_pmem(&nd_region->dev)) {
|
|
|
|
|
|
|
+ if (is_memory(&nd_region->dev)) {
|
|
|
struct resource ndr_res;
|
|
struct resource ndr_res;
|
|
|
|
|
|
|
|
if (devm_init_badblocks(dev, &nd_region->bb))
|
|
if (devm_init_badblocks(dev, &nd_region->bb))
|
|
@@ -131,7 +131,7 @@ static void nd_region_notify(struct device *dev, enum nvdimm_event event)
|
|
|
struct nd_region *nd_region = to_nd_region(dev);
|
|
struct nd_region *nd_region = to_nd_region(dev);
|
|
|
struct resource res;
|
|
struct resource res;
|
|
|
|
|
|
|
|
- if (is_nd_pmem(&nd_region->dev)) {
|
|
|
|
|
|
|
+ if (is_memory(&nd_region->dev)) {
|
|
|
res.start = nd_region->ndr_start;
|
|
res.start = nd_region->ndr_start;
|
|
|
res.end = nd_region->ndr_start +
|
|
res.end = nd_region->ndr_start +
|
|
|
nd_region->ndr_size - 1;
|
|
nd_region->ndr_size - 1;
|