From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: broonie@kernel.org
Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com,
lgirdwood@gmail.com
Subject: [PATCH 07/13] ASoC: wm_adsp: Factor out creation of alg_regions
Date: Mon, 13 Apr 2015 13:27:59 +0100 [thread overview]
Message-ID: <1428928085-20250-8-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1428928085-20250-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
Tidy up the code a little by factoring out the creation of the algorithm
regions.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm_adsp.c | 134 +++++++++++++++++++++-----------------------
1 files changed, 64 insertions(+), 70 deletions(-)
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 37e01b0..9283d08 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -913,6 +913,25 @@ static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs,
return alg;
}
+static struct wm_adsp_alg_region *wm_adsp_create_region(struct wm_adsp *dsp,
+ int type, __be32 id,
+ __be32 base)
+{
+ struct wm_adsp_alg_region *alg_region;
+
+ alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
+ if (!alg_region)
+ return ERR_PTR(-ENOMEM);
+
+ alg_region->type = type;
+ alg_region->alg = be32_to_cpu(id);
+ alg_region->base = be32_to_cpu(base);
+
+ list_add_tail(&alg_region->list, &dsp->alg_regions);
+
+ return alg_region;
+}
+
static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
{
struct wmfw_adsp1_id_hdr adsp1_id;
@@ -944,21 +963,15 @@ static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
be32_to_cpu(adsp1_id.fw.ver) & 0xff,
n_algs);
- alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
- if (!alg_region)
- return -ENOMEM;
- alg_region->type = WMFW_ADSP1_ZM;
- alg_region->alg = be32_to_cpu(adsp1_id.fw.id);
- alg_region->base = be32_to_cpu(adsp1_id.zm);
- list_add_tail(&alg_region->list, &dsp->alg_regions);
+ alg_region = wm_adsp_create_region(dsp, WMFW_ADSP1_ZM,
+ adsp1_id.fw.id, adsp1_id.zm);
+ if (IS_ERR(alg_region))
+ return PTR_ERR(alg_region);
- alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
- if (!alg_region)
- return -ENOMEM;
- alg_region->type = WMFW_ADSP1_DM;
- alg_region->alg = be32_to_cpu(adsp1_id.fw.id);
- alg_region->base = be32_to_cpu(adsp1_id.dm);
- list_add_tail(&alg_region->list, &dsp->alg_regions);
+ alg_region = wm_adsp_create_region(dsp, WMFW_ADSP1_DM,
+ adsp1_id.fw.id, adsp1_id.dm);
+ if (IS_ERR(alg_region))
+ return PTR_ERR(alg_region);
pos = sizeof(adsp1_id) / 2;
len = (sizeof(*adsp1_alg) * n_algs) / 2;
@@ -976,15 +989,13 @@ static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
be32_to_cpu(adsp1_alg[i].dm),
be32_to_cpu(adsp1_alg[i].zm));
- alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
- if (!alg_region) {
- ret = -ENOMEM;
+ alg_region = wm_adsp_create_region(dsp, WMFW_ADSP1_DM,
+ adsp1_alg[i].alg.id,
+ adsp1_alg[i].dm);
+ if (IS_ERR(alg_region)) {
+ ret = PTR_ERR(alg_region);
goto out;
}
- alg_region->type = WMFW_ADSP1_DM;
- alg_region->alg = be32_to_cpu(adsp1_alg[i].alg.id);
- alg_region->base = be32_to_cpu(adsp1_alg[i].dm);
- list_add_tail(&alg_region->list, &dsp->alg_regions);
if (i + 1 < n_algs) {
len = be32_to_cpu(adsp1_alg[i + 1].dm);
len -= be32_to_cpu(adsp1_alg[i].dm);
@@ -995,15 +1006,13 @@ static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
be32_to_cpu(adsp1_alg[i].alg.id));
}
- alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
- if (!alg_region) {
- ret = -ENOMEM;
+ alg_region = wm_adsp_create_region(dsp, WMFW_ADSP1_ZM,
+ adsp1_alg[i].alg.id,
+ adsp1_alg[i].zm);
+ if (IS_ERR(alg_region)) {
+ ret = PTR_ERR(alg_region);
goto out;
}
- alg_region->type = WMFW_ADSP1_ZM;
- alg_region->alg = be32_to_cpu(adsp1_alg[i].alg.id);
- alg_region->base = be32_to_cpu(adsp1_alg[i].zm);
- list_add_tail(&alg_region->list, &dsp->alg_regions);
if (i + 1 < n_algs) {
len = be32_to_cpu(adsp1_alg[i + 1].zm);
len -= be32_to_cpu(adsp1_alg[i].zm);
@@ -1051,29 +1060,20 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
be32_to_cpu(adsp2_id.fw.ver) & 0xff,
n_algs);
- alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
- if (!alg_region)
- return -ENOMEM;
- alg_region->type = WMFW_ADSP2_XM;
- alg_region->alg = be32_to_cpu(adsp2_id.fw.id);
- alg_region->base = be32_to_cpu(adsp2_id.xm);
- list_add_tail(&alg_region->list, &dsp->alg_regions);
+ alg_region = wm_adsp_create_region(dsp, WMFW_ADSP2_XM,
+ adsp2_id.fw.id, adsp2_id.xm);
+ if (IS_ERR(alg_region))
+ return PTR_ERR(alg_region);
- alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
- if (!alg_region)
- return -ENOMEM;
- alg_region->type = WMFW_ADSP2_YM;
- alg_region->alg = be32_to_cpu(adsp2_id.fw.id);
- alg_region->base = be32_to_cpu(adsp2_id.ym);
- list_add_tail(&alg_region->list, &dsp->alg_regions);
+ alg_region = wm_adsp_create_region(dsp, WMFW_ADSP2_YM,
+ adsp2_id.fw.id, adsp2_id.ym);
+ if (IS_ERR(alg_region))
+ return PTR_ERR(alg_region);
- alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
- if (!alg_region)
- return -ENOMEM;
- alg_region->type = WMFW_ADSP2_ZM;
- alg_region->alg = be32_to_cpu(adsp2_id.fw.id);
- alg_region->base = be32_to_cpu(adsp2_id.zm);
- list_add_tail(&alg_region->list, &dsp->alg_regions);
+ alg_region = wm_adsp_create_region(dsp, WMFW_ADSP2_ZM,
+ adsp2_id.fw.id, adsp2_id.zm);
+ if (IS_ERR(alg_region))
+ return PTR_ERR(alg_region);
pos = sizeof(adsp2_id) / 2;
len = (sizeof(*adsp2_alg) * n_algs) / 2;
@@ -1093,15 +1093,13 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
be32_to_cpu(adsp2_alg[i].ym),
be32_to_cpu(adsp2_alg[i].zm));
- alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
- if (!alg_region) {
- ret = -ENOMEM;
+ alg_region = wm_adsp_create_region(dsp, WMFW_ADSP2_XM,
+ adsp2_alg[i].alg.id,
+ adsp2_alg[i].xm);
+ if (IS_ERR(alg_region)) {
+ ret = PTR_ERR(alg_region);
goto out;
}
- alg_region->type = WMFW_ADSP2_XM;
- alg_region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
- alg_region->base = be32_to_cpu(adsp2_alg[i].xm);
- list_add_tail(&alg_region->list, &dsp->alg_regions);
if (i + 1 < n_algs) {
len = be32_to_cpu(adsp2_alg[i + 1].xm);
len -= be32_to_cpu(adsp2_alg[i].xm);
@@ -1112,15 +1110,13 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
be32_to_cpu(adsp2_alg[i].alg.id));
}
- alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
- if (!alg_region) {
- ret = -ENOMEM;
+ alg_region = wm_adsp_create_region(dsp, WMFW_ADSP2_YM,
+ adsp2_alg[i].alg.id,
+ adsp2_alg[i].ym);
+ if (IS_ERR(alg_region)) {
+ ret = PTR_ERR(alg_region);
goto out;
}
- alg_region->type = WMFW_ADSP2_YM;
- alg_region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
- alg_region->base = be32_to_cpu(adsp2_alg[i].ym);
- list_add_tail(&alg_region->list, &dsp->alg_regions);
if (i + 1 < n_algs) {
len = be32_to_cpu(adsp2_alg[i + 1].ym);
len -= be32_to_cpu(adsp2_alg[i].ym);
@@ -1131,15 +1127,13 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
be32_to_cpu(adsp2_alg[i].alg.id));
}
- alg_region = kzalloc(sizeof(*alg_region), GFP_KERNEL);
- if (!alg_region) {
- ret = -ENOMEM;
+ alg_region = wm_adsp_create_region(dsp, WMFW_ADSP2_ZM,
+ adsp2_alg[i].alg.id,
+ adsp2_alg[i].zm);
+ if (IS_ERR(alg_region)) {
+ ret = PTR_ERR(alg_region);
goto out;
}
- alg_region->type = WMFW_ADSP2_ZM;
- alg_region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
- alg_region->base = be32_to_cpu(adsp2_alg[i].zm);
- list_add_tail(&alg_region->list, &dsp->alg_regions);
if (i + 1 < n_algs) {
len = be32_to_cpu(adsp2_alg[i + 1].zm);
len -= be32_to_cpu(adsp2_alg[i].zm);
--
1.7.2.5
next prev parent reply other threads:[~2015-04-13 12:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 12:27 [PATCH 00/13] ADSP Firmware Controls Update Charles Keepax
2015-04-13 12:27 ` [PATCH 01/13] ASoC: wm_adsp: Split out adsp1 & 2 setup algorithms Charles Keepax
2015-04-13 12:27 ` [PATCH 02/13] ASoC: wm_adsp: Improve variable naming Charles Keepax
2015-04-13 12:27 ` [PATCH 03/13] ASoC: wm_adsp: Remove len field from wm_adsp_alg_region Charles Keepax
2015-04-13 12:27 ` [PATCH 04/13] ASoC: wm_adsp: Limit firmware control name to ALSA control name size Charles Keepax
2015-04-13 12:27 ` [PATCH 05/13] ASoC: wm_adsp: Move temporary control name to the stack Charles Keepax
2015-04-13 12:27 ` [PATCH 06/13] ASoC: wm_adsp: Clean up low level control read/write functions Charles Keepax
2015-04-13 12:27 ` Charles Keepax [this message]
2015-04-13 12:28 ` [PATCH 08/13] ASoC: wm_adsp: Remove private field from wm_coeff_ctl Charles Keepax
2015-04-13 12:28 ` [PATCH 09/13] ASoC: wm_adsp: Group all the ALSA control functions together Charles Keepax
2015-04-13 12:28 ` [PATCH 10/13] ASoC: wm_adsp: Add basic support for rev 1 firmware file format Charles Keepax
2015-04-18 17:26 ` Mark Brown
2015-04-13 12:28 ` [PATCH 11/13] ASoC: wm_adsp: Add support for DSP control flags Charles Keepax
2015-04-18 17:23 ` Mark Brown
2015-04-20 8:30 ` Charles Keepax
2015-04-13 12:28 ` [PATCH 12/13] ASoC: wm_adsp: Add support for rev 2 firmware file format Charles Keepax
2015-04-18 17:26 ` Mark Brown
2015-04-13 12:28 ` [PATCH 13/13] ASoC: wm_adsp: Warn that firmware file format 0 is depreciated Charles Keepax
2015-04-18 17:26 ` Mark Brown
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=1428928085-20250-8-git-send-email-ckeepax@opensource.wolfsonmicro.com \
--to=ckeepax@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=patches@opensource.wolfsonmicro.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.