Skip to contentSkip to conversation

nvme: fix drvdata setup for the nvme device

PATCH New Christoph Hellwig 3 participants 3 messages Feb 8, 2016 – Feb 9, 2016 NVMe

lore
Share & tools
lore

Christoph Hellwig

author maintainer
#0 lore raw

PATCH 1/1 nvme: fix drvdata setup for the nvme device

See http://www.infradead.org/rpr.html

Pass the right private data to device_create_with_groups from the beginning, and remove the superflous call to dev_set_drvdata.

Signed-off-by Christoph Hellwig <hch at lst.de>
---
 drivers/nvme/host/core.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/nvme/host/core.c +1 -2
index c5bf001..c326931 100644
@@ -1383,14 +1383,13 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev,
 
 	ctrl->device = device_create_with_groups(nvme_class, ctrl->dev,
 				MKDEV(nvme_char_major, ctrl->instance),
-				dev, nvme_dev_attr_groups,
+				ctrl, nvme_dev_attr_groups,
 				"nvme%d", ctrl->instance);
 	if (IS_ERR(ctrl->device)) {
 		ret = PTR_ERR(ctrl->device);
 		goto out_release_instance;
 	}
 	get_device(ctrl->device);
-	dev_set_drvdata(ctrl->device, ctrl);
 
 	spin_lock(&dev_list_lock);
 	list_add_tail(&ctrl->node, &nvme_ctrl_list);
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 nvme: fix drvdata setup for the nvme device

I noticed this one too when I was perparing the last round of CMB patches

Looks good,
Reviewed-by: Jon Derrick <jonathan.derrick at intel.com>

maintainer
#2 lore raw

PATCH 1/1 nvme: fix drvdata setup for the nvme device

In reply to Christoph Hellwig
Quoted 2 lines · Christoph Hellwig

Pass the right private data to device_create_with_groups from the beginning, and remove the superflous call to dev_set_drvdata.

Added for 4.6.

Signature · 1 line
Jens Axboe