[PATCH 02/14] device-dax: utilize new device_add_cdev helper function

Logan Gunthorpe logang at deltatee.com
Mon Feb 20 21:00:41 PST 2017


Signed-off-by: Logan Gunthorpe <logang at deltatee.com>
---
 drivers/dax/dax.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c
index ed758b7..0d24822 100644
--- a/drivers/dax/dax.c
+++ b/drivers/dax/dax.c
@@ -701,12 +701,12 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region,
 
 	/* device_initialize() so cdev can reference kobj parent */
 	device_initialize(dev);
+	dev->devt = dev_t;
 
 	cdev = &dax_dev->cdev;
 	cdev_init(cdev, &dax_fops);
 	cdev->owner = parent->driver->owner;
-	cdev->kobj.parent = &dev->kobj;
-	rc = cdev_add(&dax_dev->cdev, dev_t, 1);
+	rc = device_add_cdev(dev, cdev);
 	if (rc)
 		goto err_cdev;
 
@@ -716,7 +716,6 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region,
 	dax_dev->region = dax_region;
 	kref_get(&dax_region->kref);
 
-	dev->devt = dev_t;
 	dev->class = dax_class;
 	dev->parent = parent;
 	dev->groups = dax_attribute_groups;
-- 
2.1.4




More information about the linux-mtd mailing list