[PATCH 0/2] soc: qcom: mdt_loader: minor cleanups

[PATCH 0/2] soc: qcom: mdt_loader: minor cleanups

[Gabor Juhos]

The series contains two small patches to clean up the mdt loader code
a bit.

The first patch merges the __mdt_load() and qcom_mdt_load_no_init()
functions in order to remove a superfluous wrapper function, whilst
the second one renames a parameter of qcom_mdt_load() to make it
consistent with other functions.

Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
---
Gabor Juhos (2):
      soc: qcom: mdt_loader: merge __qcom_mdt_load() and qcom_mdt_load_no_init()
      soc: qcom: mdt_loader: rename 'firmware' parameter of qcom_mdt_load()

 drivers/soc/qcom/mdt_loader.c | 52 ++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 30 deletions(-)
---
base-commit: 682921ab33129ec46392b27e9dafcb206c2a08dd
change-id: 20251110-mdt-loader-cleanup-21915aa7b09c

Best regards,
-- 
Gabor Juhos <j4g8y7@gmail.com>

[PATCH 1/2] soc: qcom: mdt_loader: merge __qcom_mdt_load() and qcom_mdt_load_no_init()

[Gabor Juhos]

The qcom_mdt_load_no_init() function is just a simple wrapper around
of __qcom_mdt_load(). Since commit 0daf35da397b ("soc: qcom: mdt_loader:
Remove pas id parameter") both functions are using the same type of
parameters and providing the same functionality.

Keeping two functions for the same purpose is superfluous, so rename
the __qcom_mdt_load() function to qcom_mdt_load_no_init() and remove
the wrapper.

No functional changes.

Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
---
 drivers/soc/qcom/mdt_loader.c | 46 ++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index a5c80d4fcc36630359963141cb44dbf1695090d4..a68a22d174200f5f3bfced6678e5bffa0016ca14 100644
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -332,10 +332,22 @@ static bool qcom_mdt_bins_are_split(const struct firmware *fw)
 	return false;
 }
 
-static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
-			   const char *fw_name, void *mem_region,
-			   phys_addr_t mem_phys, size_t mem_size,
-			   phys_addr_t *reloc_base)
+/**
+ * qcom_mdt_load_no_init() - load the firmware which header is loaded as fw
+ * @dev:	device handle to associate resources with
+ * @fw:		firmware object for the mdt file
+ * @fw_name:	name of the firmware, for construction of segment file names
+ * @mem_region:	allocated memory region to load firmware into
+ * @mem_phys:	physical address of allocated memory region
+ * @mem_size:	size of the allocated memory region
+ * @reloc_base:	adjusted physical address after relocation
+ *
+ * Returns 0 on success, negative errno otherwise.
+ */
+int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw,
+			  const char *fw_name, void *mem_region,
+			  phys_addr_t mem_phys, size_t mem_size,
+			  phys_addr_t *reloc_base)
 {
 	const struct elf32_phdr *phdrs;
 	const struct elf32_phdr *phdr;
@@ -435,6 +447,7 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
 
 	return ret;
 }
+EXPORT_SYMBOL_GPL(qcom_mdt_load_no_init);
 
 /**
  * qcom_mdt_load() - load the firmware which header is loaded as fw
@@ -460,31 +473,10 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw,
 	if (ret)
 		return ret;
 
-	return __qcom_mdt_load(dev, fw, firmware, mem_region, mem_phys,
-			       mem_size, reloc_base);
+	return qcom_mdt_load_no_init(dev, fw, firmware, mem_region, mem_phys,
+				     mem_size, reloc_base);
 }
 EXPORT_SYMBOL_GPL(qcom_mdt_load);
 
-/**
- * qcom_mdt_load_no_init() - load the firmware which header is loaded as fw
- * @dev:	device handle to associate resources with
- * @fw:		firmware object for the mdt file
- * @firmware:	name of the firmware, for construction of segment file names
- * @mem_region:	allocated memory region to load firmware into
- * @mem_phys:	physical address of allocated memory region
- * @mem_size:	size of the allocated memory region
- * @reloc_base:	adjusted physical address after relocation
- *
- * Returns 0 on success, negative errno otherwise.
- */
-int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw,
-			  const char *firmware, void *mem_region, phys_addr_t mem_phys,
-			  size_t mem_size, phys_addr_t *reloc_base)
-{
-	return __qcom_mdt_load(dev, fw, firmware, mem_region, mem_phys,
-			       mem_size, reloc_base);
-}
-EXPORT_SYMBOL_GPL(qcom_mdt_load_no_init);
-
 MODULE_DESCRIPTION("Firmware parser for Qualcomm MDT format");
 MODULE_LICENSE("GPL v2");

-- 
2.51.1

[PATCH 2/2] soc: qcom: mdt_loader: rename 'firmware' parameter of qcom_mdt_load()

[Gabor Juhos]

In the 'mdt_loader.h' header, both the prototype and the inline
version of the qcom_mdt_load() function uses 'fw_name' as name for
the firmware name parameter. Additionally, the other qcom_mdt_*
functions are using that as well.

For consistency, rename the 'firmware' parameter in the implementation
of the qcom_mdt_load() to 'fw_name' and update the function accordingly.

No functional changes.

Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
---
 drivers/soc/qcom/mdt_loader.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index a68a22d174200f5f3bfced6678e5bffa0016ca14..c239107cb93017eca6f6b00876e2c10706a3e50d 100644
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -453,7 +453,7 @@ EXPORT_SYMBOL_GPL(qcom_mdt_load_no_init);
  * qcom_mdt_load() - load the firmware which header is loaded as fw
  * @dev:	device handle to associate resources with
  * @fw:		firmware object for the mdt file
- * @firmware:	name of the firmware, for construction of segment file names
+ * @fw_name:	name of the firmware, for construction of segment file names
  * @pas_id:	PAS identifier
  * @mem_region:	allocated memory region to load firmware into
  * @mem_phys:	physical address of allocated memory region
@@ -463,17 +463,17 @@ EXPORT_SYMBOL_GPL(qcom_mdt_load_no_init);
  * Returns 0 on success, negative errno otherwise.
  */
 int qcom_mdt_load(struct device *dev, const struct firmware *fw,
-		  const char *firmware, int pas_id, void *mem_region,
+		  const char *fw_name, int pas_id, void *mem_region,
 		  phys_addr_t mem_phys, size_t mem_size,
 		  phys_addr_t *reloc_base)
 {
 	int ret;
 
-	ret = qcom_mdt_pas_init(dev, fw, firmware, pas_id, mem_phys, NULL);
+	ret = qcom_mdt_pas_init(dev, fw, fw_name, pas_id, mem_phys, NULL);
 	if (ret)
 		return ret;
 
-	return qcom_mdt_load_no_init(dev, fw, firmware, mem_region, mem_phys,
+	return qcom_mdt_load_no_init(dev, fw, fw_name, mem_region, mem_phys,
 				     mem_size, reloc_base);
 }
 EXPORT_SYMBOL_GPL(qcom_mdt_load);

-- 
2.51.1

Re: [PATCH 1/2] soc: qcom: mdt_loader: merge __qcom_mdt_load() and qcom_mdt_load_no_init()

[Dmitry Baryshkov]

On Tue, Nov 11, 2025 at 08:40:10AM +0100, Gabor Juhos wrote:
> The qcom_mdt_load_no_init() function is just a simple wrapper around
> of __qcom_mdt_load(). Since commit 0daf35da397b ("soc: qcom: mdt_loader:
> Remove pas id parameter") both functions are using the same type of
> parameters and providing the same functionality.
> 
> Keeping two functions for the same purpose is superfluous, so rename
> the __qcom_mdt_load() function to qcom_mdt_load_no_init() and remove
> the wrapper.
> 
> No functional changes.
> 
> Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
> ---
>  drivers/soc/qcom/mdt_loader.c | 46 ++++++++++++++++++-------------------------
>  1 file changed, 19 insertions(+), 27 deletions(-)
> 

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>


-- 
With best wishes
Dmitry

Re: [PATCH 2/2] soc: qcom: mdt_loader: rename 'firmware' parameter of qcom_mdt_load()

[Dmitry Baryshkov]

On Tue, Nov 11, 2025 at 08:40:11AM +0100, Gabor Juhos wrote:
> In the 'mdt_loader.h' header, both the prototype and the inline
> version of the qcom_mdt_load() function uses 'fw_name' as name for
> the firmware name parameter. Additionally, the other qcom_mdt_*
> functions are using that as well.
> 
> For consistency, rename the 'firmware' parameter in the implementation
> of the qcom_mdt_load() to 'fw_name' and update the function accordingly.
> 
> No functional changes.
> 
> Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
> ---
>  drivers/soc/qcom/mdt_loader.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

-- 
With best wishes
Dmitry

Re: [PATCH 0/2] soc: qcom: mdt_loader: minor cleanups

[Bjorn Andersson]

On Tue, 11 Nov 2025 08:40:09 +0100, Gabor Juhos wrote:
> The series contains two small patches to clean up the mdt loader code
> a bit.
> 
> The first patch merges the __mdt_load() and qcom_mdt_load_no_init()
> functions in order to remove a superfluous wrapper function, whilst
> the second one renames a parameter of qcom_mdt_load() to make it
> consistent with other functions.
> 
> [...]

Applied, thanks!

[1/2] soc: qcom: mdt_loader: merge __qcom_mdt_load() and qcom_mdt_load_no_init()
      commit: 0cda8823b176a5303a2c4bc2366908e3049c416e
[2/2] soc: qcom: mdt_loader: rename 'firmware' parameter of qcom_mdt_load()
      commit: 186b8f8fcc86949eaf0c3bd11a47048ec4c78b5b

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>