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

platform/x86/intel/vsec: Assign auxdev parent by argument 



Instead of checking for a NULL parent argument in intel_vsec_add_aux() and
then assigning it to the probed device, remove this check and just pass the
device in the call. Since this function is exported, return -EINVAL if the
parent is not specified.

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-7-david.e.box@linux.intel.com


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

drivers/platform/x86/intel/vsec.c

+4 −4
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent, 
	struct auxiliary_device *auxdev = &intel_vsec_dev->auxdev;

	int ret, id;



	if (!parent)

		return -EINVAL;



	ret = xa_alloc(&auxdev_array, &intel_vsec_dev->id, intel_vsec_dev,

		       PMT_XA_LIMIT, GFP_KERNEL);

	if (ret < 0) {
@@ -121,9 +124,6 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent, 
		return id;

	}



	if (!parent)

		parent = &pdev->dev;



	auxdev->id = id;

	auxdev->name = name;

	auxdev->dev.parent = parent;
@@ -205,7 +205,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he 
	 * 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),

	return intel_vsec_add_aux(pdev, &pdev->dev, no_free_ptr(intel_vsec_dev),

				  intel_vsec_name(header->id));

}