* [PATCH v2 0/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c - Fixed several checkpatch issues
@ 2017-04-08 16:21 Andrea della Porta
2017-04-08 16:21 ` [PATCH v2 1/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed checkpatch warning about unaligned function params Andrea della Porta
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Andrea della Porta @ 2017-04-08 16:21 UTC (permalink / raw)
To: Lee Jones, Eric Anholt, Stefan Wahren, Greg Kroah-Hartman,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list, linux-rpi-kernel, linux-arm-kernel,
devel, linux-kernel
Andrea della Porta (3):
staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed checkpatch
warning about unaligned function params
staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed codepatch
coding style issue, line over 80
staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed extra space
coding style issue
.../vc04_services/bcm2835-audio/bcm2835-pcm.c | 48 +++++++++++-----------
1 file changed, 23 insertions(+), 25 deletions(-)
--
2.4.10
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2 1/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed checkpatch warning about unaligned function params 2017-04-08 16:21 [PATCH v2 0/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c - Fixed several checkpatch issues Andrea della Porta @ 2017-04-08 16:21 ` Andrea della Porta 2017-04-09 7:30 ` Greg Kroah-Hartman 2017-04-08 16:22 ` [PATCH v2 2/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed codepatch coding style issue, line over 80 Andrea della Porta 2017-04-08 16:22 ` [PATCH v2 3/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed extra space coding style issue Andrea della Porta 2 siblings, 1 reply; 5+ messages in thread From: Andrea della Porta @ 2017-04-08 16:21 UTC (permalink / raw) To: Lee Jones, Eric Anholt, Stefan Wahren, Greg Kroah-Hartman, Florian Fainelli, Ray Jui, Scott Branden, bcm-kernel-feedback-list, linux-rpi-kernel, linux-arm-kernel, devel, linux-kernel Fixed unaligned function parameters issues, as per checkpatch warning Signed-off-by: Andrea della Porta <sfaragnaus@gmail.com> --- Changes in v2: - subject line more explicit - checkpatch output removed as requested, summarized in one line .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 47 ++++++++++------------ 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c index 8bd69b9..fa6d3d2 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c @@ -68,7 +68,7 @@ void bcm2835_playback_fifo(struct bcm2835_alsa_stream *alsa_stream) audio_info(" .. IN\n"); audio_info("alsa_stream=%p substream=%p\n", alsa_stream, - alsa_stream ? alsa_stream->substream : 0); + alsa_stream ? alsa_stream->substream : 0); if (alsa_stream->open) consumed = bcm2835_audio_retrieve_buffers(alsa_stream); @@ -83,10 +83,10 @@ void bcm2835_playback_fifo(struct bcm2835_alsa_stream *alsa_stream) new_period = 1; } audio_debug("updating pos cur: %d + %d max:%d period_bytes:%d, hw_ptr: %d new_period:%d\n", - alsa_stream->pos, + alsa_stream->pos, consumed, alsa_stream->buffer_size, - (int) (alsa_stream->period_size * alsa_stream->substream->runtime->periods), + (int)(alsa_stream->period_size * alsa_stream->substream->runtime->periods), frames_to_bytes(alsa_stream->substream->runtime, alsa_stream->substream->runtime->status->hw_ptr), new_period); if (alsa_stream->buffer_size) { @@ -229,6 +229,7 @@ static int snd_bcm2835_playback_close(struct snd_pcm_substream *substream) */ if (alsa_stream->running) { int err; + err = bcm2835_audio_stop(alsa_stream); alsa_stream->running = 0; if (err) @@ -259,7 +260,7 @@ static int snd_bcm2835_playback_close(struct snd_pcm_substream *substream) /* hw_params callback */ static int snd_bcm2835_pcm_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) + struct snd_pcm_hw_params *params) { struct snd_pcm_runtime *runtime = substream->runtime; struct bcm2835_alsa_stream *alsa_stream = runtime->private_data; @@ -312,18 +313,16 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream) channels = alsa_stream->channels; err = bcm2835_audio_set_params(alsa_stream, channels, - alsa_stream->params_rate, - alsa_stream->pcm_format_width); + alsa_stream->params_rate, + alsa_stream->pcm_format_width); if (err < 0) audio_error(" error setting hw params\n"); - bcm2835_audio_setup(alsa_stream); /* in preparation of the stream, set the controls (volume level) of the stream */ bcm2835_audio_set_ctls(alsa_stream->chip); - memset(&alsa_stream->pcm_indirect, 0, sizeof(alsa_stream->pcm_indirect)); alsa_stream->pcm_indirect.hw_buffer_size = @@ -335,8 +334,8 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream) alsa_stream->pos = 0; audio_debug("buffer_size=%d, period_size=%d pos=%d frame_bits=%d\n", - alsa_stream->buffer_size, alsa_stream->period_size, - alsa_stream->pos, runtime->frame_bits); + alsa_stream->buffer_size, alsa_stream->period_size, + alsa_stream->pos, runtime->frame_bits); mutex_unlock(&chip->audio_mutex); audio_info(" .. OUT\n"); @@ -344,17 +343,16 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream) } static void snd_bcm2835_pcm_transfer(struct snd_pcm_substream *substream, - struct snd_pcm_indirect *rec, size_t bytes) + struct snd_pcm_indirect *rec, size_t bytes) { struct snd_pcm_runtime *runtime = substream->runtime; struct bcm2835_alsa_stream *alsa_stream = runtime->private_data; - void *src = (void *) (substream->runtime->dma_area + rec->sw_data); + void *src = (void *)(substream->runtime->dma_area + rec->sw_data); int err; err = bcm2835_audio_write(alsa_stream, bytes, src); if (err) audio_error(" Failed to transfer to alsa device (%d)\n", err); - } static int snd_bcm2835_pcm_ack(struct snd_pcm_substream *substream) @@ -381,14 +379,14 @@ static int snd_bcm2835_pcm_trigger(struct snd_pcm_substream *substream, int cmd) switch (cmd) { case SNDRV_PCM_TRIGGER_START: audio_debug("bcm2835_AUDIO_TRIGGER_START running=%d\n", - alsa_stream->running); + alsa_stream->running); if (!alsa_stream->running) { err = bcm2835_audio_start(alsa_stream); if (!err) { alsa_stream->pcm_indirect.hw_io = alsa_stream->pcm_indirect.hw_data = bytes_to_frames(runtime, - alsa_stream->pos); + alsa_stream->pos); substream->ops->ack(substream); alsa_stream->running = 1; alsa_stream->draining = 1; @@ -433,23 +431,23 @@ snd_bcm2835_pcm_pointer(struct snd_pcm_substream *substream) audio_info(" .. IN\n"); audio_debug("pcm_pointer... (%d) hwptr=%d appl=%d pos=%d\n", 0, - frames_to_bytes(runtime, runtime->status->hw_ptr), - frames_to_bytes(runtime, runtime->control->appl_ptr), - alsa_stream->pos); + frames_to_bytes(runtime, runtime->status->hw_ptr), + frames_to_bytes(runtime, runtime->control->appl_ptr), + alsa_stream->pos); audio_info(" .. OUT\n"); return snd_pcm_indirect_playback_pointer(substream, - &alsa_stream->pcm_indirect, - alsa_stream->pos); + &alsa_stream->pcm_indirect, + alsa_stream->pos); } static int snd_bcm2835_pcm_lib_ioctl(struct snd_pcm_substream *substream, - unsigned int cmd, void *arg) + unsigned int cmd, void *arg) { int ret = snd_pcm_lib_ioctl(substream, cmd, arg); audio_info(" .. substream=%p, cmd=%d, arg=%p (%x) ret=%d\n", substream, - cmd, arg, arg ? *(unsigned *) arg : 0, ret); + cmd, arg, arg ? *(unsigned *)arg : 0, ret); return ret; } @@ -510,7 +508,6 @@ int snd_bcm2835_new_pcm(struct bcm2835_chip *chip, u32 numchannels) snd_bcm2835_playback_hw.buffer_bytes_max, snd_bcm2835_playback_hw.buffer_bytes_max); - out: mutex_unlock(&chip->audio_mutex); audio_info(" .. OUT\n"); @@ -541,8 +538,8 @@ int snd_bcm2835_new_spdif_pcm(struct bcm2835_chip *chip) /* pre-allocation of buffers */ /* NOTE: this may fail */ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, - snd_dma_continuous_data(GFP_KERNEL), - snd_bcm2835_playback_spdif_hw.buffer_bytes_max, snd_bcm2835_playback_spdif_hw.buffer_bytes_max); + snd_dma_continuous_data(GFP_KERNEL), + snd_bcm2835_playback_spdif_hw.buffer_bytes_max, snd_bcm2835_playback_spdif_hw.buffer_bytes_max); out: mutex_unlock(&chip->audio_mutex); audio_info(" .. OUT\n"); -- 2.4.10 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed checkpatch warning about unaligned function params 2017-04-08 16:21 ` [PATCH v2 1/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed checkpatch warning about unaligned function params Andrea della Porta @ 2017-04-09 7:30 ` Greg Kroah-Hartman 0 siblings, 0 replies; 5+ messages in thread From: Greg Kroah-Hartman @ 2017-04-09 7:30 UTC (permalink / raw) To: Andrea della Porta Cc: Lee Jones, Eric Anholt, Stefan Wahren, Florian Fainelli, Ray Jui, Scott Branden, bcm-kernel-feedback-list, linux-rpi-kernel, linux-arm-kernel, devel, linux-kernel On Sat, Apr 08, 2017 at 05:21:38PM +0100, Andrea della Porta wrote: > Fixed unaligned function parameters issues, as per checkpatch warning > > Signed-off-by: Andrea della Porta <sfaragnaus@gmail.com> > --- > Changes in v2: > - subject line more explicit > - checkpatch output removed as requested, summarized in one line This does not apply to my tree at all, can you rebase this series against staging-testing and resend? thanks, greg k-h ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 2/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed codepatch coding style issue, line over 80 2017-04-08 16:21 [PATCH v2 0/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c - Fixed several checkpatch issues Andrea della Porta 2017-04-08 16:21 ` [PATCH v2 1/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed checkpatch warning about unaligned function params Andrea della Porta @ 2017-04-08 16:22 ` Andrea della Porta 2017-04-08 16:22 ` [PATCH v2 3/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed extra space coding style issue Andrea della Porta 2 siblings, 0 replies; 5+ messages in thread From: Andrea della Porta @ 2017-04-08 16:22 UTC (permalink / raw) To: Lee Jones, Eric Anholt, Stefan Wahren, Greg Kroah-Hartman, Florian Fainelli, Ray Jui, Scott Branden, bcm-kernel-feedback-list, linux-rpi-kernel, linux-arm-kernel, devel, linux-kernel Fixed checkpatch warning about line over 80 chars Signed-off-by: Andrea della Porta <sfaragnaus@gmail.com> --- Changes in v2: - subject line more explicit - chekpatch output removed as requested, summarized in one line drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c index fa6d3d2..f1ce5cf 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c @@ -539,7 +539,8 @@ int snd_bcm2835_new_spdif_pcm(struct bcm2835_chip *chip) /* NOTE: this may fail */ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, snd_dma_continuous_data(GFP_KERNEL), - snd_bcm2835_playback_spdif_hw.buffer_bytes_max, snd_bcm2835_playback_spdif_hw.buffer_bytes_max); + snd_bcm2835_playback_spdif_hw.buffer_bytes_max, + snd_bcm2835_playback_spdif_hw.buffer_bytes_max); out: mutex_unlock(&chip->audio_mutex); audio_info(" .. OUT\n"); -- 2.4.10 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 3/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed extra space coding style issue 2017-04-08 16:21 [PATCH v2 0/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c - Fixed several checkpatch issues Andrea della Porta 2017-04-08 16:21 ` [PATCH v2 1/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed checkpatch warning about unaligned function params Andrea della Porta 2017-04-08 16:22 ` [PATCH v2 2/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed codepatch coding style issue, line over 80 Andrea della Porta @ 2017-04-08 16:22 ` Andrea della Porta 2 siblings, 0 replies; 5+ messages in thread From: Andrea della Porta @ 2017-04-08 16:22 UTC (permalink / raw) To: Lee Jones, Eric Anholt, Stefan Wahren, Greg Kroah-Hartman, Florian Fainelli, Ray Jui, Scott Branden, bcm-kernel-feedback-list, linux-rpi-kernel, linux-arm-kernel, devel, linux-kernel Removed an extra spaces at the end of the line Signed-off-by: Andrea della Porta <sfaragnaus@gmail.com> --- Changes in v2: - subject line more explicit drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c index f1ce5cf..451942a 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c @@ -539,7 +539,7 @@ int snd_bcm2835_new_spdif_pcm(struct bcm2835_chip *chip) /* NOTE: this may fail */ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, snd_dma_continuous_data(GFP_KERNEL), - snd_bcm2835_playback_spdif_hw.buffer_bytes_max, + snd_bcm2835_playback_spdif_hw.buffer_bytes_max, snd_bcm2835_playback_spdif_hw.buffer_bytes_max); out: mutex_unlock(&chip->audio_mutex); -- 2.4.10 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-09 7:31 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-04-08 16:21 [PATCH v2 0/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c - Fixed several checkpatch issues Andrea della Porta 2017-04-08 16:21 ` [PATCH v2 1/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed checkpatch warning about unaligned function params Andrea della Porta 2017-04-09 7:30 ` Greg Kroah-Hartman 2017-04-08 16:22 ` [PATCH v2 2/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed codepatch coding style issue, line over 80 Andrea della Porta 2017-04-08 16:22 ` [PATCH v2 3/3] staging: vc04_services: bcm2835-audio: bcm2835-pcm.c Fixed extra space coding style issue Andrea della Porta
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).