kevin/linux
1
Fork 0
Code

ASoC: ops: Simplify with cleanup.h

Browse Source 
Allocate the memory with scoped/cleanup.h to reduce error handling (less
error paths) and make the code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20240703-asoc-cleanup-h-v1-9-71219dfd0aef@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2024-07-03 14:11:03 +02:00 committed by Mark Brown
parent 7d996c8a5f
commit 1a7b846818
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sound/soc/soc-ops.c
View File

@ -11,6 +11,7 @@
// with code, comments and ideas from :- // with code, comments and ideas from :-
// Richard Purdie <richard@openedhand.com> // Richard Purdie <richard@openedhand.com>
#include <linux/cleanup.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/init.h> #include <linux/init.h>
@ -727,14 +728,14 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
struct soc_bytes *params = (void *)kcontrol->private_value; struct soc_bytes *params = (void *)kcontrol->private_value;
int ret, len; int ret, len;
unsigned int val, mask; unsigned int val, mask;
void *data;
if (!component->regmap || !params->num_regs) if (!component->regmap || !params->num_regs)
return -EINVAL; return -EINVAL;
len = params->num_regs * component->val_bytes; len = params->num_regs * component->val_bytes;
data = kmemdup(ucontrol->value.bytes.data, len, GFP_KERNEL | GFP_DMA); void *data __free(kfree) = kmemdup(ucontrol->value.bytes.data, len,
GFP_KERNEL | GFP_DMA);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
@ -746,7 +747,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
if (params->mask) { if (params->mask) {
ret = regmap_read(component->regmap, params->base, &val); ret = regmap_read(component->regmap, params->base, &val);
if (ret != 0) if (ret != 0)
goto out; return ret;
val &= params->mask; val &= params->mask;
@ -760,14 +761,14 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
ret = regmap_parse_val(component->regmap, ret = regmap_parse_val(component->regmap,
&mask, &mask); &mask, &mask);
if (ret != 0) if (ret != 0)
goto out; return ret;
((u16 *)data)[0] &= mask; ((u16 *)data)[0] &= mask;
ret = regmap_parse_val(component->regmap, ret = regmap_parse_val(component->regmap,
&val, &val); &val, &val);
if (ret != 0) if (ret != 0)
goto out; return ret;
((u16 *)data)[0] |= val; ((u16 *)data)[0] |= val;
break; break;
@ -776,30 +777,23 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
ret = regmap_parse_val(component->regmap, ret = regmap_parse_val(component->regmap,
&mask, &mask); &mask, &mask);
if (ret != 0) if (ret != 0)
goto out; return ret;
((u32 *)data)[0] &= mask; ((u32 *)data)[0] &= mask;
ret = regmap_parse_val(component->regmap, ret = regmap_parse_val(component->regmap,
&val, &val); &val, &val);
if (ret != 0) if (ret != 0)
goto out; return ret;
((u32 *)data)[0] |= val; ((u32 *)data)[0] |= val;
break; break;
default: default:
ret = -EINVAL; return -EINVAL;
goto out;
} }
} }
ret = regmap_raw_write(component->regmap, params->base, return regmap_raw_write(component->regmap, params->base, data, len);
data, len);
out:
kfree(data);
return ret;
} }
EXPORT_SYMBOL_GPL(snd_soc_bytes_put); EXPORT_SYMBOL_GPL(snd_soc_bytes_put);