aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-4.19/950-0403-staging-bcm2835-audio-reorder-variable-declarations-.patch
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-08 21:58:55 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-14 14:10:51 +0100
commit7d7aa2fd924c27829ec25f825481554dd81bce97 (patch)
tree658b87b89331670266163e522ea5fb52535633cb /target/linux/bcm27xx/patches-4.19/950-0403-staging-bcm2835-audio-reorder-variable-declarations-.patch
parente7bfda2c243e66a75ff966ba04c28b1590b5d24c (diff)
downloadupstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.gz
upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.bz2
upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.zip
brcm2708: rename target to bcm27xx
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-4.19/950-0403-staging-bcm2835-audio-reorder-variable-declarations-.patch')
-rw-r--r--target/linux/bcm27xx/patches-4.19/950-0403-staging-bcm2835-audio-reorder-variable-declarations-.patch118
1 files changed, 118 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-4.19/950-0403-staging-bcm2835-audio-reorder-variable-declarations-.patch b/target/linux/bcm27xx/patches-4.19/950-0403-staging-bcm2835-audio-reorder-variable-declarations-.patch
new file mode 100644
index 0000000000..6b9ac81b97
--- /dev/null
+++ b/target/linux/bcm27xx/patches-4.19/950-0403-staging-bcm2835-audio-reorder-variable-declarations-.patch
@@ -0,0 +1,118 @@
+From 604f0019cc1eaed6a316d7875fe697e53f5f105c Mon Sep 17 00:00:00 2001
+From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+Date: Wed, 17 Oct 2018 21:01:52 +0200
+Subject: [PATCH] staging: bcm2835-audio: reorder variable declarations
+ & remove trivial comments
+
+commit d048385a070552ae819f99f05bd03ec41072783d upstream.
+
+When it comes to declaring variables it's preferred, when possible, to
+use an inverted tree organization scheme.
+
+Also, removes some comments that were useless.
+
+Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+Reviewed-by: Takashi Iwai <tiwai@suse.de>
+Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 10 ++--------
+ .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 4 ++--
+ .../staging/vc04_services/bcm2835-audio/bcm2835.c | 14 +++++++-------
+ 3 files changed, 11 insertions(+), 17 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
++++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
+@@ -164,14 +164,11 @@ static int snd_bcm2835_playback_spdif_op
+ return snd_bcm2835_playback_open_generic(substream, 1);
+ }
+
+-/* close callback */
+ static int snd_bcm2835_playback_close(struct snd_pcm_substream *substream)
+ {
+- /* the hardware-specific codes will be here */
+-
+- struct bcm2835_chip *chip;
+- struct snd_pcm_runtime *runtime;
+ struct bcm2835_alsa_stream *alsa_stream;
++ struct snd_pcm_runtime *runtime;
++ struct bcm2835_chip *chip;
+
+ chip = snd_pcm_substream_chip(substream);
+ mutex_lock(&chip->audio_mutex);
+@@ -195,20 +192,17 @@ static int snd_bcm2835_playback_close(st
+ return 0;
+ }
+
+-/* hw_params callback */
+ static int snd_bcm2835_pcm_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+ {
+ return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
+ }
+
+-/* hw_free callback */
+ static int snd_bcm2835_pcm_hw_free(struct snd_pcm_substream *substream)
+ {
+ return snd_pcm_lib_free_pages(substream);
+ }
+
+-/* prepare callback */
+ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
+ {
+ struct bcm2835_chip *chip = snd_pcm_substream_chip(substream);
+--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
++++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+@@ -94,9 +94,9 @@ static void audio_vchi_callback(void *pa
+ void *msg_handle)
+ {
+ struct bcm2835_audio_instance *instance = param;
+- int status;
+- int msg_len;
+ struct vc_audio_msg m;
++ int msg_len;
++ int status;
+
+ if (reason != VCHI_CALLBACK_MSG_AVAILABLE)
+ return;
+--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
++++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
+@@ -161,8 +161,8 @@ static int snd_add_child_device(struct d
+ struct bcm2835_audio_driver *audio_driver,
+ u32 numchans)
+ {
+- struct snd_card *card;
+ struct bcm2835_chip *chip;
++ struct snd_card *card;
+ int err;
+
+ err = snd_card_new(dev, -1, NULL, THIS_MODULE, sizeof(*chip), &card);
+@@ -225,12 +225,12 @@ static int snd_add_child_device(struct d
+
+ static int snd_add_child_devices(struct device *device, u32 numchans)
+ {
+- int i;
+- int count_devices = 0;
+- int minchannels = 0;
+- int extrachannels = 0;
+ int extrachannels_per_driver = 0;
+ int extrachannels_remainder = 0;
++ int count_devices = 0;
++ int extrachannels = 0;
++ int minchannels = 0;
++ int i;
+
+ for (i = 0; i < ARRAY_SIZE(children_devices); i++)
+ if (*children_devices[i].is_enabled)
+@@ -258,9 +258,9 @@ static int snd_add_child_devices(struct
+ extrachannels_remainder);
+
+ for (i = 0; i < ARRAY_SIZE(children_devices); i++) {
+- int err;
+- int numchannels_this_device;
+ struct bcm2835_audio_driver *audio_driver;
++ int numchannels_this_device;
++ int err;
+
+ if (!*children_devices[i].is_enabled)
+ continue;