From 7cc2fe1efb4a7f91a8fbda4016324e7efd6e50ef Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Sep 2018 12:23:15 +0200 Subject: [PATCH] drop other alsa patches from 3.18 that didn't need to be there. --- ...alsa-asihpi-fix-pcm-format-notations.patch | 82 ------------------- ...sa-riptide-properly-endian-notations.patch | 38 --------- ...sa-sb-fix-pcm-format-bit-calculation.patch | 63 -------------- queue-3.18/series | 3 - 4 files changed, 186 deletions(-) delete mode 100644 queue-3.18/alsa-asihpi-fix-pcm-format-notations.patch delete mode 100644 queue-3.18/alsa-riptide-properly-endian-notations.patch delete mode 100644 queue-3.18/alsa-sb-fix-pcm-format-bit-calculation.patch diff --git a/queue-3.18/alsa-asihpi-fix-pcm-format-notations.patch b/queue-3.18/alsa-asihpi-fix-pcm-format-notations.patch deleted file mode 100644 index 67c4e901493..00000000000 --- a/queue-3.18/alsa-asihpi-fix-pcm-format-notations.patch +++ /dev/null @@ -1,82 +0,0 @@ -From foo@baz Mon Sep 17 11:45:58 CEST 2018 -From: Takashi Iwai -Date: Wed, 25 Jul 2018 23:19:41 +0200 -Subject: ALSA: asihpi: Fix PCM format notations - -From: Takashi Iwai - -[ Upstream commit a91a0e774984aa57090c39dc3269a812417737ed ] - -asihpi driver treats -1 as an own invalid PCM format, but this needs -a proper cast with __force prefix since PCM format type is __bitwise. -Define a constant with the proper type and use it allover. - -This fixes sparse warnings like: - sound/pci/asihpi/asihpi.c:315:9: warning: incorrect type in initializer (different base types) - -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - sound/pci/asihpi/asihpi.c | 24 +++++++++++++----------- - 1 file changed, 13 insertions(+), 11 deletions(-) - ---- a/sound/pci/asihpi/asihpi.c -+++ b/sound/pci/asihpi/asihpi.c -@@ -306,27 +306,29 @@ static void print_hwparams(struct snd_pc - - } - -+#define INVALID_FORMAT (__force snd_pcm_format_t)(-1) -+ - static snd_pcm_format_t hpi_to_alsa_formats[] = { -- -1, /* INVALID */ -+ INVALID_FORMAT, /* INVALID */ - SNDRV_PCM_FORMAT_U8, /* HPI_FORMAT_PCM8_UNSIGNED 1 */ - SNDRV_PCM_FORMAT_S16, /* HPI_FORMAT_PCM16_SIGNED 2 */ -- -1, /* HPI_FORMAT_MPEG_L1 3 */ -+ INVALID_FORMAT, /* HPI_FORMAT_MPEG_L1 3 */ - SNDRV_PCM_FORMAT_MPEG, /* HPI_FORMAT_MPEG_L2 4 */ - SNDRV_PCM_FORMAT_MPEG, /* HPI_FORMAT_MPEG_L3 5 */ -- -1, /* HPI_FORMAT_DOLBY_AC2 6 */ -- -1, /* HPI_FORMAT_DOLBY_AC3 7 */ -+ INVALID_FORMAT, /* HPI_FORMAT_DOLBY_AC2 6 */ -+ INVALID_FORMAT, /* HPI_FORMAT_DOLBY_AC3 7 */ - SNDRV_PCM_FORMAT_S16_BE,/* HPI_FORMAT_PCM16_BIGENDIAN 8 */ -- -1, /* HPI_FORMAT_AA_TAGIT1_HITS 9 */ -- -1, /* HPI_FORMAT_AA_TAGIT1_INSERTS 10 */ -+ INVALID_FORMAT, /* HPI_FORMAT_AA_TAGIT1_HITS 9 */ -+ INVALID_FORMAT, /* HPI_FORMAT_AA_TAGIT1_INSERTS 10 */ - SNDRV_PCM_FORMAT_S32, /* HPI_FORMAT_PCM32_SIGNED 11 */ -- -1, /* HPI_FORMAT_RAW_BITSTREAM 12 */ -- -1, /* HPI_FORMAT_AA_TAGIT1_HITS_EX1 13 */ -+ INVALID_FORMAT, /* HPI_FORMAT_RAW_BITSTREAM 12 */ -+ INVALID_FORMAT, /* HPI_FORMAT_AA_TAGIT1_HITS_EX1 13 */ - SNDRV_PCM_FORMAT_FLOAT, /* HPI_FORMAT_PCM32_FLOAT 14 */ - #if 1 - /* ALSA can't handle 3 byte sample size together with power-of-2 - * constraint on buffer_bytes, so disable this format - */ -- -1 -+ INVALID_FORMAT - #else - /* SNDRV_PCM_FORMAT_S24_3LE */ /* HPI_FORMAT_PCM24_SIGNED 15 */ - #endif -@@ -968,7 +970,7 @@ static u64 snd_card_asihpi_playback_form - format, sample_rate, 128000, 0); - if (!err) - err = hpi_outstream_query_format(h_stream, &hpi_format); -- if (!err && (hpi_to_alsa_formats[format] != -1)) -+ if (!err && (hpi_to_alsa_formats[format] != INVALID_FORMAT)) - formats |= pcm_format_to_bits(hpi_to_alsa_formats[format]); - } - return formats; -@@ -1144,7 +1146,7 @@ static u64 snd_card_asihpi_capture_forma - format, sample_rate, 128000, 0); - if (!err) - err = hpi_instream_query_format(h_stream, &hpi_format); -- if (!err && (hpi_to_alsa_formats[format] != -1)) -+ if (!err && (hpi_to_alsa_formats[format] != INVALID_FORMAT)) - formats |= pcm_format_to_bits(hpi_to_alsa_formats[format]); - } - return formats; diff --git a/queue-3.18/alsa-riptide-properly-endian-notations.patch b/queue-3.18/alsa-riptide-properly-endian-notations.patch deleted file mode 100644 index 0f2fc9aa94e..00000000000 --- a/queue-3.18/alsa-riptide-properly-endian-notations.patch +++ /dev/null @@ -1,38 +0,0 @@ -From foo@baz Mon Sep 17 11:45:57 CEST 2018 -From: Takashi Iwai -Date: Wed, 25 Jul 2018 23:24:04 +0200 -Subject: ALSA: riptide: Properly endian notations - -From: Takashi Iwai - -[ Upstream commit be05e3de3a933156d472127f659d4473c461dcc5 ] - -The SG descriptor of Riptide contains the little-endian values, hence -we need to define with __le32 properly. This fixes sparse warnings -like: - sound/pci/riptide/riptide.c:1112:40: warning: cast to restricted __le32 - -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - sound/pci/riptide/riptide.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/sound/pci/riptide/riptide.c -+++ b/sound/pci/riptide/riptide.c -@@ -470,10 +470,10 @@ struct snd_riptide { - }; - - struct sgd { /* scatter gather desriptor */ -- u32 dwNextLink; -- u32 dwSegPtrPhys; -- u32 dwSegLen; -- u32 dwStat_Ctl; -+ __le32 dwNextLink; -+ __le32 dwSegPtrPhys; -+ __le32 dwSegLen; -+ __le32 dwStat_Ctl; - }; - - struct pcmhw { /* pcm descriptor */ diff --git a/queue-3.18/alsa-sb-fix-pcm-format-bit-calculation.patch b/queue-3.18/alsa-sb-fix-pcm-format-bit-calculation.patch deleted file mode 100644 index f488a0cfff3..00000000000 --- a/queue-3.18/alsa-sb-fix-pcm-format-bit-calculation.patch +++ /dev/null @@ -1,63 +0,0 @@ -From foo@baz Mon Sep 17 11:45:57 CEST 2018 -From: Takashi Iwai -Date: Wed, 25 Jul 2018 23:19:43 +0200 -Subject: ALSA: sb: Fix PCM format bit calculation - -From: Takashi Iwai - -[ Upstream commit 55ff2d1ea5487fe131cce399baf4503dcf5cc8e1 ] - -The PCM format type in snd_pcm_format_t can't be treated as integer -implicitly since it's with __bitwise. We have already a helper -function to get the bit index of the given type, and use it in each -place instead. - -This fixes sparse warnings like: - sound/isa/sb/sb16_main.c:61:44: warning: restricted snd_pcm_format_t degrades to integer - -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - sound/isa/sb/sb16_main.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - ---- a/sound/isa/sb/sb16_main.c -+++ b/sound/isa/sb/sb16_main.c -@@ -49,6 +49,9 @@ MODULE_AUTHOR("Jaroslav Kysela format)) -+ - #ifdef CONFIG_SND_SB16_CSP - static void snd_sb16_csp_playback_prepare(struct snd_sb *chip, struct snd_pcm_runtime *runtime) - { -@@ -58,7 +61,7 @@ static void snd_sb16_csp_playback_prepar - if (csp->running & SNDRV_SB_CSP_ST_LOADED) { - /* manually loaded codec */ - if ((csp->mode & SNDRV_SB_CSP_MODE_DSP_WRITE) && -- ((1U << runtime->format) == csp->acc_format)) { -+ (runtime_format_bits(runtime) == csp->acc_format)) { - /* Supported runtime PCM format for playback */ - if (csp->ops.csp_use(csp) == 0) { - /* If CSP was successfully acquired */ -@@ -66,7 +69,7 @@ static void snd_sb16_csp_playback_prepar - } - } else if ((csp->mode & SNDRV_SB_CSP_MODE_QSOUND) && (csp->q_enabled)) { - /* QSound decoder is loaded and enabled */ -- if ((1 << runtime->format) & (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 | -+ if (runtime_format_bits(runtime) & (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_U16_LE)) { - /* Only for simple PCM formats */ - if (csp->ops.csp_use(csp) == 0) { -@@ -106,7 +109,7 @@ static void snd_sb16_csp_capture_prepare - if (csp->running & SNDRV_SB_CSP_ST_LOADED) { - /* manually loaded codec */ - if ((csp->mode & SNDRV_SB_CSP_MODE_DSP_READ) && -- ((1U << runtime->format) == csp->acc_format)) { -+ (runtime_format_bits(runtime) == csp->acc_format)) { - /* Supported runtime PCM format for capture */ - if (csp->ops.csp_use(csp) == 0) { - /* If CSP was successfully acquired */ diff --git a/queue-3.18/series b/queue-3.18/series index a52eb0b2f63..8b35257e187 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -56,7 +56,4 @@ partitions-aix-append-null-character-to-print-data-from-disk.patch partitions-aix-fix-usage-of-uninitialized-lv_info-and-lvname-structures.patch mfd-ti_am335x_tscadc-fix-struct-clk-memory-leak.patch f2fs-fix-to-do-sanity-check-with-sit-nat-_ver_bitmap_bytesize.patch -alsa-riptide-properly-endian-notations.patch -alsa-sb-fix-pcm-format-bit-calculation.patch -alsa-asihpi-fix-pcm-format-notations.patch mips-warn_on-invalid-dma-cache-maintenance-not-bug_on.patch -- 2.47.2