提交 46d2398c 编写于 作者: S Subramanian Mohan 提交者: Bjorn Helgaas

PCI: vmd: Use devm_kasprintf() instead of simple kasprintf()

Use devm_kasprintf() instead of simple kasprintf() to free allocated memory
automatically when the device is freed.
Suggested-by: NSrikanth Thokala <srikanth.thokala@intel.com>
Link: https://lore.kernel.org/r/20220531132617.20517-1-subramanian.mohan@intel.comSigned-off-by: NSubramanian Mohan <subramanian.mohan@intel.com>
Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
Acked-by: NNirmal Patel <nirmal.patel@linux.intel.com>
上级 f2906aa8
...@@ -898,7 +898,8 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id) ...@@ -898,7 +898,8 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
if (vmd->instance < 0) if (vmd->instance < 0)
return vmd->instance; return vmd->instance;
vmd->name = kasprintf(GFP_KERNEL, "vmd%d", vmd->instance); vmd->name = devm_kasprintf(&dev->dev, GFP_KERNEL, "vmd%d",
vmd->instance);
if (!vmd->name) { if (!vmd->name) {
err = -ENOMEM; err = -ENOMEM;
goto out_release_instance; goto out_release_instance;
...@@ -936,7 +937,6 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id) ...@@ -936,7 +937,6 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
out_release_instance: out_release_instance:
ida_simple_remove(&vmd_instance_ida, vmd->instance); ida_simple_remove(&vmd_instance_ida, vmd->instance);
kfree(vmd->name);
return err; return err;
} }
...@@ -959,7 +959,6 @@ static void vmd_remove(struct pci_dev *dev) ...@@ -959,7 +959,6 @@ static void vmd_remove(struct pci_dev *dev)
vmd_detach_resources(vmd); vmd_detach_resources(vmd);
vmd_remove_irq_domain(vmd); vmd_remove_irq_domain(vmd);
ida_simple_remove(&vmd_instance_ida, vmd->instance); ida_simple_remove(&vmd_instance_ida, vmd->instance);
kfree(vmd->name);
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册