[PATCH 1/1] Intel: ASoC: remove duplicated code on merge

[PATCH 1/1] Intel: ASoC: remove duplicated code on merge

[han.lu]

From: "Lu, Han" <han.lu@intel.com>

Signed-off-by: Lu, Han <han.lu@intel.com>

diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
index d4865a6..43fb5f3 100644
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
@@ -2363,11 +2363,6 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
 	/* init param buffer */
 	sst_hsw_reset_param_buf(hsw);
 
-	/* allocate scratch mem regions */
-	ret = sst_block_alloc_scratch(hsw->dsp);
-	if (ret < 0)
-		goto boot_err;
-
 	/* wait for DSP boot completion */
 	sst_dsp_boot(hsw->dsp);
 	ret = wait_event_timeout(hsw->boot_wait, hsw->boot_complete,
-- 
1.9.1

Re: [PATCH 1/1] Intel: ASoC: remove duplicated code on merge

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 409 bytes --]

On Mon, Mar 16, 2015 at 12:46:29PM +0800, han.lu@intel.com wrote:
> From: "Lu, Han" <han.lu@intel.com>
> 
> Signed-off-by: Lu, Han <han.lu@intel.com>

Please include a commit description explaining what the problem you're
trying to fix is (like where the two different copies came from).  I've
tweaked the way the merges are being done which I think has stopped this
happening, can you check please?

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 1/1] Intel: ASoC: remove duplicated code on merge

[Lu, Han]

Hi Mark,

My patch was trying to fix the error introduced by commit 527cab6 in
branch for-next, where the code block of "allocate scratch mem regions"
appears twice.
However, I see the issue has been fixed and no duplicated code found in
latest branch, so my patch is not required anymore, please ignore it.
Thanks.

BR,
Han Lu

> -----Original Message-----
> From: Mark Brown [mailto:broonie@kernel.org]
> Sent: Monday, March 16, 2015 7:01 PM
> To: Lu, Han
> Cc: alsa-devel@alsa-project.org; Girdwood, Liam R
> Subject: Re: [PATCH 1/1] Intel: ASoC: remove duplicated code on merge
> 
> On Mon, Mar 16, 2015 at 12:46:29PM +0800, han.lu@intel.com wrote:
> > From: "Lu, Han" <han.lu@intel.com>
> >
> > Signed-off-by: Lu, Han <han.lu@intel.com>
> 
> Please include a commit description explaining what the problem you're
> trying to fix is (like where the two different copies came from).  I've tweaked
> the way the merges are being done which I think has stopped this happening,
> can you check please?