From: Greg Kroah-Hartman Date: Mon, 17 Sep 2018 10:23:30 +0000 (+0200) Subject: drop some 4.4 alsa patches that were not needed X-Git-Tag: v4.18.9~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8cbd1206bc7ba897669d99334e405ae5cbb1a81;p=thirdparty%2Fkernel%2Fstable-queue.git drop some 4.4 alsa patches that were not needed --- diff --git a/queue-4.4/alsa-asihpi-fix-pcm-format-notations.patch b/queue-4.4/alsa-asihpi-fix-pcm-format-notations.patch deleted file mode 100644 index e0228e736aa..00000000000 --- a/queue-4.4/alsa-asihpi-fix-pcm-format-notations.patch +++ /dev/null @@ -1,82 +0,0 @@ -From foo@baz Mon Sep 17 12:15:09 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 -@@ -311,27 +311,29 @@ static void print_hwparams(struct snd_pc - snd_pcm_format_width(params_format(p)) / 8); - } - -+#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 -@@ -1030,7 +1032,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; -@@ -1213,7 +1215,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-4.4/alsa-hda-fix-implicit-pcm-format-type-conversion.patch b/queue-4.4/alsa-hda-fix-implicit-pcm-format-type-conversion.patch deleted file mode 100644 index 167c20f5f33..00000000000 --- a/queue-4.4/alsa-hda-fix-implicit-pcm-format-type-conversion.patch +++ /dev/null @@ -1,55 +0,0 @@ -From foo@baz Mon Sep 17 12:15:09 CEST 2018 -From: Takashi Iwai -Date: Wed, 25 Jul 2018 23:19:36 +0200 -Subject: ALSA: hda: Fix implicit PCM format type conversion - -From: Takashi Iwai - -[ Upstream commit a6ea5fe95ab4a1a7af6d57429fe3ecde9acf5b5a ] - -The PCM format type is defined with __bitwise, hence it can't be -passed as integer but needs an explicit cast. In this patch, instead -of the messy cast flood, define the format argument of -snd_hdac_calc_stream_format() to be the proper snd_pcm_format_t type. - -This fixes sparse warnings like: - sound/hda/hdac_device.c:760:38: warning: incorrect type in argument 1 (different base types) - -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - include/sound/hdaudio.h | 3 ++- - sound/hda/hdac_device.c | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - ---- a/include/sound/hdaudio.h -+++ b/include/sound/hdaudio.h -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -132,7 +133,7 @@ int snd_hdac_get_sub_nodes(struct hdac_d - hda_nid_t *start_id); - unsigned int snd_hdac_calc_stream_format(unsigned int rate, - unsigned int channels, -- unsigned int format, -+ snd_pcm_format_t format, - unsigned int maxbps, - unsigned short spdif_ctls); - int snd_hdac_query_supported_pcm(struct hdac_device *codec, hda_nid_t nid, ---- a/sound/hda/hdac_device.c -+++ b/sound/hda/hdac_device.c -@@ -745,7 +745,7 @@ static struct hda_rate_tbl rate_bits[] = - */ - unsigned int snd_hdac_calc_stream_format(unsigned int rate, - unsigned int channels, -- unsigned int format, -+ snd_pcm_format_t format, - unsigned int maxbps, - unsigned short spdif_ctls) - { diff --git a/queue-4.4/alsa-riptide-properly-endian-notations.patch b/queue-4.4/alsa-riptide-properly-endian-notations.patch deleted file mode 100644 index d0e93ea89e1..00000000000 --- a/queue-4.4/alsa-riptide-properly-endian-notations.patch +++ /dev/null @@ -1,38 +0,0 @@ -From foo@baz Mon Sep 17 12:15:09 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-4.4/alsa-sb-fix-pcm-format-bit-calculation.patch b/queue-4.4/alsa-sb-fix-pcm-format-bit-calculation.patch deleted file mode 100644 index 962614397fe..00000000000 --- a/queue-4.4/alsa-sb-fix-pcm-format-bit-calculation.patch +++ /dev/null @@ -1,63 +0,0 @@ -From foo@baz Mon Sep 17 12:15:09 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-4.4/series b/queue-4.4/series index 418d2448d04..41211e70a13 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -42,9 +42,5 @@ partitions-aix-fix-usage-of-uninitialized-lv_info-and-lvname-structures.patch iommu-ipmmu-vmsa-fix-allocation-in-atomic-context.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 -alsa-hda-fix-implicit-pcm-format-type-conversion.patch mips-warn_on-invalid-dma-cache-maintenance-not-bug_on.patch rdma-cma-do-not-ignore-net-namespace-for-unbound-cm_id.patch