Commit a3af58c1 authored by David E. Box's avatar David E. Box Committed by Jia, Yingbao
Browse files

platform/x86/intel/vsec: Remove unnecessary return 

mainline inclusion
from mainline-v6.8
commit ace7b6f00870cea56460df335606e35ace3c07ac
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB6QCG
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ace7b6f00870cea56460df335606e35ace3c07ac



-------------------------------------------------

Intel-SIG: commit ace7b6f00870 platform/x86/intel/vsec: Remove unnecessary return.
Backport intel tpmi base driver update for 5.10

In intel_vsec_add_aux(), just return from the last call to
devm_add_action_or_reset() instead of checking its return value.

Suggested-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
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-3-david.e.box@linux.intel.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 87fa1e0e

drivers/platform/x86/intel_vsec.c

+1 −5
Original line number Diff line number Diff line
@@ -167,12 +167,8 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent, 
		return ret;

	}



	ret = devm_add_action_or_reset(parent, intel_vsec_remove_aux,

	return devm_add_action_or_reset(parent, intel_vsec_remove_aux,

				       auxdev);

	if (ret < 0)

		return ret;



	return 0;

}

EXPORT_SYMBOL_NS_GPL(intel_vsec_add_aux, INTEL_VSEC);