Commit 1d1b4770 authored by David E. Box's avatar David E. Box Committed by Hans de Goede
Browse files

platform/x86/intel/vsec: Use cleanup.h 



Use cleanup.h helpers to handle cleanup of resources in
intel_vsec_add_dev() after failures.

Signed-off-by: default avatarDavid E. Box <david.e.box@linux.intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231129222132.2331261-6-david.e.box@linux.intel.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 0a0a52ab

drivers/platform/x86/intel/vsec.c

+11 −7
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/auxiliary_bus.h>

#include <linux/bits.h>

#include <linux/cleanup.h>

#include <linux/delay.h>

#include <linux/kernel.h>

#include <linux/idr.h>
@@ -148,8 +149,9 @@ EXPORT_SYMBOL_NS_GPL(intel_vsec_add_aux, INTEL_VSEC); 
static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *header,

			      struct intel_vsec_platform_info *info)

{

	struct intel_vsec_device *intel_vsec_dev;

	struct resource *res, *tmp;

	struct intel_vsec_device __free(kfree) *intel_vsec_dev = NULL;

	struct resource __free(kfree) *res = NULL;

	struct resource *tmp;

	unsigned long quirks = info->quirks;

	int i;
@@ -171,10 +173,8 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he 
		return -ENOMEM;



	res = kcalloc(header->num_entries, sizeof(*res), GFP_KERNEL);

	if (!res) {

		kfree(intel_vsec_dev);

	if (!res)

		return -ENOMEM;

	}



	if (quirks & VSEC_QUIRK_TABLE_SHIFT)

		header->offset >>= TABLE_OFFSET_SHIFT;
@@ -192,7 +192,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he 
	}



	intel_vsec_dev->pcidev = pdev;

	intel_vsec_dev->resource = res;

	intel_vsec_dev->resource = no_free_ptr(res);

	intel_vsec_dev->num_resources = header->num_entries;

	intel_vsec_dev->quirks = info->quirks;
@@ -201,7 +201,11 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he 
	else

		intel_vsec_dev->ida = &intel_vsec_ida;



	return intel_vsec_add_aux(pdev, NULL, intel_vsec_dev,

	/*

	 * Pass the ownership of intel_vsec_dev and resource within it to

	 * intel_vsec_add_aux()

	 */

	return intel_vsec_add_aux(pdev, NULL, no_free_ptr(intel_vsec_dev),

				  intel_vsec_name(header->id));

}