From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 20 Mar 2023 10:38:15 +0000 (+0100)
Subject: platform/x86/intel: vsec: Use intel_vsec_dev_release() to simplify init() error cleanup
X-Git-Tag: v6.4-rc1~159^2~40
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6f561677c2f234bcf215350b76f2a2fea95fbebf;p=linux-block.git

platform/x86/intel: vsec: Use intel_vsec_dev_release() to simplify init() error cleanup

On auxiliary_device_init(auxdev) failure we need to do the exact same
cleanup steps as on device.release(), so use the intel_vsec_dev_release()
callback for this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230320103815.229729-1-hdegoede@redhat.com
---

diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index 01b1f6480e5c..42904b431d87 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -153,11 +153,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
 
 	ret = auxiliary_device_init(auxdev);
 	if (ret < 0) {
-		mutex_lock(&vsec_ida_lock);
-		ida_free(intel_vsec_dev->ida, auxdev->id);
-		mutex_unlock(&vsec_ida_lock);
-		kfree(intel_vsec_dev->resource);
-		kfree(intel_vsec_dev);
+		intel_vsec_dev_release(&auxdev->dev);
 		return ret;
 	}