Received-SPF: pass (google.com: domain of aishpant@gmail.com designates 2607:f8b0:400e:c00::241 as permitted sender) client-ip=2607:f8b0:400e:c00::241;
Date: Mon, 6 Mar 2017 13:12:12 +0530
From: Aishwarya Pant <aishpant@gmail.com>
To: Julia Lawall <julia.lawall@lip6.fr>
Cc: outreachy-kernel@googlegroups.com
Subject: Re: [Outreachy kernel] [PATCH] staging: bcm2835-audio: refactor code
Message-ID: <20170306074212.GA19258@aishwarya>
References: <20170306051742.GA21192@aishwarya>
 <alpine.DEB.2.20.1703060741300.2259@hadrien>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.20.1703060741300.2259@hadrien>
User-Agent: Mutt/1.5.24 (2015-08-30)

On Mon, Mar 06, 2017 at 07:41:53AM +0100, Julia Lawall wrote:
> 
> 
> On Mon, 6 Mar 2017, Aishwarya Pant wrote:
> 
> > This patch contains the following fixes:
> > -Merge two if conditions into one
> > -Remove initialization of unused semaphores
> > alsa_stream->buffers_update_sem and alsa_stream->control_sem
> > -Modify goto label err_free_mem to kfree vchi_instance if vchi_connect
> > fails; add label err_init to add debug log and return error value
> > (pre-existing functionality)
> 
> These changes appear to be completely unrelated.  There should be three
> patches.

These changes don't build upon each other, so they should be sent as
three patches (and not a patchset) right?

> 
> julia
> 
> >
> > Signed-off-by: Aishwarya Pant <aishpant@gmail.com>
> > ---
> >  drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c   | 8 ++------
> >  drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c | 9 ++++++---
> >  2 files changed, 8 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
> > index d60d702..32b3793 100644
> > --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
> > +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
> > @@ -122,10 +122,8 @@ static int snd_bcm2835_playback_open_generic(
> >  	audio_info("Alsa open (%d)\n", substream->number);
> >  	idx = substream->number;
> >
> > -	if (spdif && chip->opened) {
> > -		err = -EBUSY;
> > -		goto out;
> > -	} else if (!spdif && (chip->opened & (1 << idx))) {
> > +	if ((spdif && chip->opened) ||
> > +	    (!spdif && (chip->opened & (1 << idx))))	{
> >  		err = -EBUSY;
> >  		goto out;
> >  	}
> > @@ -156,8 +154,6 @@ static int snd_bcm2835_playback_open_generic(
> >  	alsa_stream->substream = substream;
> >  	alsa_stream->idx = idx;
> >
> > -	sema_init(&alsa_stream->buffers_update_sem, 0);
> > -	sema_init(&alsa_stream->control_sem, 0);
> >  	spin_lock_init(&alsa_stream->lock);
> >
> >  	err = bcm2835_audio_open(alsa_stream);
> > diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> > index df1f3dd..557ba8e 100644
> > --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> > +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> > @@ -402,7 +402,7 @@ static int bcm2835_audio_open_connection(struct bcm2835_alsa_stream *alsa_stream
> >  		instance->alsa_stream = alsa_stream;
> >  		alsa_stream->instance = instance;
> >  		ret = 0; // xxx todo -1;
> > -		goto err_free_mem;
> > +		goto err_init;
> >  	}
> >
> >  	/* Initialize and create a VCHI connection */
> > @@ -413,7 +413,7 @@ static int bcm2835_audio_open_connection(struct bcm2835_alsa_stream *alsa_stream
> >  				__func__, ret);
> >
> >  			ret = -EIO;
> > -			goto err_free_mem;
> > +			goto err_init;
> >  		}
> >  		ret = vchi_connect(NULL, 0, vchi_instance);
> >  		if (ret) {
> > @@ -441,9 +441,12 @@ static int bcm2835_audio_open_connection(struct bcm2835_alsa_stream *alsa_stream
> >
> >  	LOG_DBG(" success !\n");
> >  	ret = 0;
> > +err_init:
> > +	LOG_DBG(" .. OUT\n");
> > +	return ret;
> >  err_free_mem:
> >  	LOG_DBG(" .. OUT\n");
> > -
> > +	kfree(vchi_instance);
> >  	return ret;
> >  }
> >
> > --
> > 2.7.4
> >
> > --
> > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170306051742.GA21192%40aishwarya.
> > For more options, visit https://groups.google.com/d/optout.
> >