ASoC: wm_adsp: Factor out creation of alg_regions

Tidy up the code a little by factoring out the creation of the algorithm
regions.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 37e01b0b93f6570d929dd6c1bbfdbeec488cb3cd..9283d08de3d90f72f9344759f7d65c12b0547fb1 100644 (file)
--- 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);