[PATCH V6 06/20] platform/x86/intel/vsec: Assign auxdev parent by argument

David E. Box
2023-11-29T22:21:57Z

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: David E. Box <david.e.box@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
V6 - No change

V5 - New patch

drivers/platform/x86/intel/vsec.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index 27e8698ebe5e..329ba03a6da0 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -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) {
@@ -120,9 +123,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;
@@ -204,7 +204,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));
}

--
2.34.1