Unverified Commit 67820eb9 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

ASoC: codecs: lpass-wsa-macro: Simplify with cleanup.h 



Driver's probe() has two allocations which are needed only within the
probe() itself - for devm_regmap_init_mmio().

Usage of devm interface is a bit misleading here, because these can be
freed right after each scope finishes.

This makes the code a bit more obvious and self documenting.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20240701-b4-qcom-audio-lpass-codec-cleanups-v3-6-6d98d4dd1ef5@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c72585d7

sound/soc/codecs/lpass-wsa-macro.c

+10 −12
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.



#include <linux/cleanup.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/io.h>
@@ -2725,8 +2726,6 @@ static const struct snd_soc_component_driver wsa_macro_component_drv = { 
static int wsa_macro_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct reg_default *reg_defaults;

	struct regmap_config *reg_config;

	struct wsa_macro *wsa;

	kernel_ulong_t flags;

	void __iomem *base;
@@ -2765,6 +2764,8 @@ static int wsa_macro_probe(struct platform_device *pdev) 
		return PTR_ERR(base);



	wsa->codec_version = lpass_macro_get_codec_version();

	struct reg_default *reg_defaults __free(kfree) = NULL;



	switch (wsa->codec_version) {

	case LPASS_CODEC_VERSION_1_0:

	case LPASS_CODEC_VERSION_1_1:
@@ -2773,8 +2774,7 @@ static int wsa_macro_probe(struct platform_device *pdev) 
	case LPASS_CODEC_VERSION_2_1:

		wsa->reg_layout = &wsa_codec_v2_1;

		def_count = ARRAY_SIZE(wsa_defaults) + ARRAY_SIZE(wsa_defaults_v2_1);

		reg_defaults = devm_kmalloc_array(dev, def_count,

						  sizeof(*reg_defaults),

		reg_defaults = kmalloc_array(def_count, sizeof(*reg_defaults),

					     GFP_KERNEL);

		if (!reg_defaults)

			return -ENOMEM;
@@ -2789,8 +2789,7 @@ static int wsa_macro_probe(struct platform_device *pdev) 
	case LPASS_CODEC_VERSION_2_8:

		wsa->reg_layout = &wsa_codec_v2_5;

		def_count = ARRAY_SIZE(wsa_defaults) + ARRAY_SIZE(wsa_defaults_v2_5);

		reg_defaults = devm_kmalloc_array(dev, def_count,

						  sizeof(*reg_defaults),

		reg_defaults = kmalloc_array(def_count, sizeof(*reg_defaults),

					     GFP_KERNEL);

		if (!reg_defaults)

			return -ENOMEM;
@@ -2804,8 +2803,9 @@ static int wsa_macro_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	reg_config = devm_kmemdup(dev, &wsa_regmap_config,

				  sizeof(*reg_config), GFP_KERNEL);

	struct regmap_config *reg_config __free(kfree) = kmemdup(&wsa_regmap_config,

								 sizeof(*reg_config),

								 GFP_KERNEL);

	if (!reg_config)

		return -ENOMEM;
@@ -2816,8 +2816,6 @@ static int wsa_macro_probe(struct platform_device *pdev) 
	if (IS_ERR(wsa->regmap))

		return PTR_ERR(wsa->regmap);



	devm_kfree(dev, reg_config);

	devm_kfree(dev, reg_defaults);

	dev_set_drvdata(dev, wsa);



	wsa->dev = dev;