From: "David E. Box" <david.e.box@linux.intel.com>
To: linux-kernel@vger.kernel.org,
platform-driver-x86@vger.kernel.org,
ilpo.jarvinen@linux.intel.com, rajvi.jingar@linux.intel.com
Subject: [PATCH V4 03/17] platform/x86/intel/vsec: Use cleanup.h
Date: Wed, 18 Oct 2023 16:16:10 -0700 [thread overview]
Message-ID: <20231018231624.1044633-4-david.e.box@linux.intel.com> (raw)
In-Reply-To: <20231018231624.1044633-1-david.e.box@linux.intel.com>
Use cleanup.h helpers to handle cleanup of resources in
intel_vsec_add_dev() after failures.
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
---
V4 - Do no_free_ptr() before and in call to intel_vsec_add_aux().
- Add resource cleanup in this patch.
V3 - New patch.
drivers/platform/x86/intel/vsec.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index b14eba545770..28191313d515 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -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>
@@ -147,10 +148,11 @@ 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;
+ int ret, i;
if (!intel_vsec_supported(header->id, info->caps))
return -EINVAL;
@@ -170,10 +172,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;
@@ -200,8 +200,15 @@ 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,
- intel_vsec_name(header->id));
+ /*
+ * Pass the ownership of intel_vsec_dev and resource within it to
+ * intel_vsec_add_aux()
+ */
+ no_free_ptr(res);
+ ret = intel_vsec_add_aux(pdev, NULL, no_free_ptr(intel_vsec_dev),
+ intel_vsec_name(header->id));
+
+ return ret;
}
static bool intel_vsec_walk_header(struct pci_dev *pdev,
--
2.34.1
next prev parent reply other threads:[~2023-10-18 23:16 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 23:16 [PATCH V4 00/17] intel_pmc: Add telemetry API to read counters David E. Box
2023-10-18 23:16 ` [PATCH V4 01/17] platform/x86/intel/vsec: Move structures to header David E. Box
2023-10-18 23:16 ` [PATCH V4 02/17] platform/x86/intel/vsec: remove platform_info from vsec device structure David E. Box
2023-10-18 23:16 ` David E. Box [this message]
2023-10-19 1:03 ` [PATCH V4 03/17] platform/x86/intel/vsec: Use cleanup.h kernel test robot
2023-10-23 15:15 ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 04/17] platform/x86/intel/vsec: Add intel_vsec_register David E. Box
2023-10-23 15:21 ` Ilpo Järvinen
2023-10-24 23:25 ` David E. Box
2023-10-18 23:16 ` [PATCH V4 05/17] platform/x86/intel/vsec: Add base address field David E. Box
2023-10-18 23:16 ` [PATCH V4 06/17] platform/x86/intel/pmt: Add header to struct intel_pmt_entry David E. Box
2023-10-23 15:14 ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 07/17] platform/x86/intel/pmt: telemetry: Export API to read telemetry David E. Box
2023-10-18 23:16 ` [PATCH V4 08/17] platform/x86:intel/pmc: Call pmc_get_low_power_modes from platform init David E. Box
2023-10-18 23:16 ` [PATCH V4 09/17] platform/x86/intel/pmc: Allow pmc_core_ssram_init to fail David E. Box
2023-10-23 15:17 ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 10/17] linux/io.h: iounmap/ioport_unmap cleanup.h support David E. Box
2023-10-19 2:12 ` kernel test robot
2023-10-19 2:23 ` kernel test robot
2023-10-23 15:25 ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 11/17] platform/x86/intel/pmc: Split pmc_core_ssram_get_pmc() David E. Box
2023-10-19 1:35 ` kernel test robot
2023-10-23 16:01 ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 12/17] platform/x86/intel/pmc: Find and register PMC telemetry entries David E. Box
2023-10-18 23:16 ` [PATCH V4 13/17] platform/x86/intel/pmc: Display LPM requirements for multiple PMCs David E. Box
2023-10-23 16:15 ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 14/17] platform/x86/intel/pmc: Retrieve LPM information using Intel PMT David E. Box
2023-10-23 16:19 ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 15/17] platform/x86/intel/pmc: Read low power mode requirements for MTL-M and MTL-P David E. Box
2023-10-18 23:16 ` [PATCH V4 16/17] platform/x86/intel/pmc: Add debug attribute for Die C6 counter David E. Box
2023-10-23 16:31 ` Ilpo Järvinen
2023-10-26 20:28 ` David E. Box
2023-10-18 23:16 ` [PATCH V4 17/17] platform/x86/intel/pmc: Show Die C6 counter on Meteor Lake David E. Box
2023-10-23 16:33 ` Ilpo Järvinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231018231624.1044633-4-david.e.box@linux.intel.com \
--to=david.e.box@linux.intel.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rajvi.jingar@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.