summaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm/blk.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-03-18 02:23:09 +0100
committerDan Williams <dan.j.williams@intel.com>2016-04-22 19:59:54 +0200
commite32bc729a3a486e20443db3379ecf67240b20616 (patch)
tree1d4e0b6dd686eb88766581cce79b59ab04266284 /drivers/nvdimm/blk.c
parentlibnvdimm, pfn, convert nd_pfn_probe() to devm (diff)
downloadlinux-e32bc729a3a486e20443db3379ecf67240b20616.tar.xz
linux-e32bc729a3a486e20443db3379ecf67240b20616.zip
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/blk.c')
-rw-r--r--drivers/nvdimm/blk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c
index 24649396b638..c8215dc356cc 100644
--- a/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@ -314,7 +314,7 @@ static int nd_blk_probe(struct device *dev)
ndns->rw_bytes = nd_blk_rw_bytes;
if (is_nd_btt(dev))
rc = nvdimm_namespace_attach_btt(ndns);
- else if (nd_btt_probe(ndns, blk_dev) == 0) {
+ else if (nd_btt_probe(dev, ndns, blk_dev) == 0) {
/* we'll come back as btt-blk */
rc = -ENXIO;
} else