projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.9/dax' into libnvdimm-for-next
[cascardo/linux.git]
/
drivers
/
dax
/
pmem.c
diff --git
a/drivers/dax/pmem.c
b/drivers/dax/pmem.c
index
1f01e98
..
9630d88
100644
(file)
--- a/
drivers/dax/pmem.c
+++ b/
drivers/dax/pmem.c
@@
-24,7
+24,7
@@
struct dax_pmem {
struct completion cmp;
};
struct completion cmp;
};
-struct dax_pmem *to_dax_pmem(struct percpu_ref *ref)
+st
atic st
ruct dax_pmem *to_dax_pmem(struct percpu_ref *ref)
{
return container_of(ref, struct dax_pmem, ref);
}
{
return container_of(ref, struct dax_pmem, ref);
}
@@
-61,6
+61,7
@@
static int dax_pmem_probe(struct device *dev)
int rc;
void *addr;
struct resource res;
int rc;
void *addr;
struct resource res;
+ struct dax_dev *dax_dev;
struct nd_pfn_sb *pfn_sb;
struct dax_pmem *dax_pmem;
struct nd_region *nd_region;
struct nd_pfn_sb *pfn_sb;
struct dax_pmem *dax_pmem;
struct nd_region *nd_region;
@@
-126,12
+127,12
@@
static int dax_pmem_probe(struct device *dev)
return -ENOMEM;
/* TODO: support for subdividing a dax region... */
return -ENOMEM;
/* TODO: support for subdividing a dax region... */
-
rc
= devm_create_dax_dev(dax_region, &res, 1);
+
dax_dev
= devm_create_dax_dev(dax_region, &res, 1);
/* child dax_dev instances now own the lifetime of the dax_region */
dax_region_put(dax_region);
/* child dax_dev instances now own the lifetime of the dax_region */
dax_region_put(dax_region);
- return
rc
;
+ return
PTR_ERR_OR_ZERO(dax_dev)
;
}
static struct nd_device_driver dax_pmem_driver = {
}
static struct nd_device_driver dax_pmem_driver = {