* [PATCH] platform/x86/intel: vsec: Use intel_vsec_dev_release() to simplify init() error cleanup
@ 2023-03-20 10:38 Hans de Goede
2023-03-20 12:11 ` Andy Shevchenko
2023-03-20 14:21 ` Hans de Goede
0 siblings, 2 replies; 3+ messages in thread
From: Hans de Goede @ 2023-03-20 10:38 UTC (permalink / raw)
To: David E . Box, Srinivas Pandruvada, Mark Gross, Andy Shevchenko
Cc: Hans de Goede, platform-driver-x86
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>
---
drivers/platform/x86/intel/vsec.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index 2311c16cb975..cf2a20088f6b 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -169,11 +169,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;
}
--
2.39.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] platform/x86/intel: vsec: Use intel_vsec_dev_release() to simplify init() error cleanup
2023-03-20 10:38 [PATCH] platform/x86/intel: vsec: Use intel_vsec_dev_release() to simplify init() error cleanup Hans de Goede
@ 2023-03-20 12:11 ` Andy Shevchenko
2023-03-20 14:21 ` Hans de Goede
1 sibling, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2023-03-20 12:11 UTC (permalink / raw)
To: Hans de Goede
Cc: David E . Box, Srinivas Pandruvada, Mark Gross, Andy Shevchenko,
platform-driver-x86
On Mon, Mar 20, 2023 at 12:38 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> 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.
Sounds correct to me.
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> drivers/platform/x86/intel/vsec.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
> index 2311c16cb975..cf2a20088f6b 100644
> --- a/drivers/platform/x86/intel/vsec.c
> +++ b/drivers/platform/x86/intel/vsec.c
> @@ -169,11 +169,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;
> }
>
> --
> 2.39.1
>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] platform/x86/intel: vsec: Use intel_vsec_dev_release() to simplify init() error cleanup
2023-03-20 10:38 [PATCH] platform/x86/intel: vsec: Use intel_vsec_dev_release() to simplify init() error cleanup Hans de Goede
2023-03-20 12:11 ` Andy Shevchenko
@ 2023-03-20 14:21 ` Hans de Goede
1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2023-03-20 14:21 UTC (permalink / raw)
To: David E . Box, Srinivas Pandruvada, Mark Gross, Andy Shevchenko
Cc: platform-driver-x86
Hi,
On 3/20/23 11:38, Hans de Goede wrote:
> 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>
I've added this to my review-hans (soon to be for-next) branch now.
Regards,
Hans
> ---
> drivers/platform/x86/intel/vsec.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
> index 2311c16cb975..cf2a20088f6b 100644
> --- a/drivers/platform/x86/intel/vsec.c
> +++ b/drivers/platform/x86/intel/vsec.c
> @@ -169,11 +169,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;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-20 14:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-20 10:38 [PATCH] platform/x86/intel: vsec: Use intel_vsec_dev_release() to simplify init() error cleanup Hans de Goede
2023-03-20 12:11 ` Andy Shevchenko
2023-03-20 14:21 ` Hans de Goede
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).