diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-03-18 04:23:09 +0300 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-04-22 20:59:54 +0300 |
commit | e32bc729a3a486e20443db3379ecf67240b20616 (patch) | |
tree | 1d4e0b6dd686eb88766581cce79b59ab04266284 /drivers/nvdimm/pmem.c | |
parent | bd032943b5b2b336994171dcebc11531a38b45ba (diff) | |
download | linux-e32bc729a3a486e20443db3379ecf67240b20616.tar.xz |
libnvdimm, btt, convert nd_btt_probe() to devm
Pass the device performing the probe so we can use a devm allocation for
the btt superblock.
Cc: Vishal Verma <vishal.l.verma@intel.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm/pmem.c')
-rw-r--r-- | drivers/nvdimm/pmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 4d8f5c55aade..6fa39f55dbe3 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -574,7 +574,7 @@ static int nd_pmem_probe(struct device *dev) if (is_nd_pfn(dev)) return nvdimm_namespace_attach_pfn(ndns); - if (nd_btt_probe(ndns, pmem) == 0 + if (nd_btt_probe(dev, ndns, pmem) == 0 || nd_pfn_probe(dev, ndns, pmem) == 0) { /* * We'll come back as either btt-pmem, or pfn-pmem, so |