From: Greg Kroah-Hartman Date: Mon, 17 Sep 2018 10:14:24 +0000 (+0200) Subject: drop some sparse 3.18 patches X-Git-Tag: v4.18.9~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ed52553bad9254f681608651cd65f61a24b964b;p=thirdparty%2Fkernel%2Fstable-queue.git drop some sparse 3.18 patches --- diff --git a/queue-3.18/alsa-ad1816a-fix-sparse-warning-wrt-pcm-format-type.patch b/queue-3.18/alsa-ad1816a-fix-sparse-warning-wrt-pcm-format-type.patch deleted file mode 100644 index 03994a624f1..00000000000 --- a/queue-3.18/alsa-ad1816a-fix-sparse-warning-wrt-pcm-format-type.patch +++ /dev/null @@ -1,36 +0,0 @@ -From foo@baz Mon Sep 17 11:45:58 CEST 2018 -From: Takashi Iwai -Date: Wed, 25 Jul 2018 23:19:39 +0200 -Subject: ALSA: ad1816a: Fix sparse warning wrt PCM format type - -From: Takashi Iwai - -[ Upstream commit d63f33d3f083bdb3a7c2dfd623f4d811b2a8d772 ] - -The PCM format type is with __bitwise, and it can't be converted from -integer implicitly. Instead of an ugly cast, declare the function -argument of snd_ad1816a_get_format() with the proper snd_pcm_format_t -type. - -This fixes the sparse warning like: - sound/isa/ad1816a/ad1816a_lib.c:93:14: 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/ad1816a/ad1816a_lib.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/sound/isa/ad1816a/ad1816a_lib.c -+++ b/sound/isa/ad1816a/ad1816a_lib.c -@@ -85,7 +85,8 @@ static void snd_ad1816a_write_mask(struc - - - static unsigned char snd_ad1816a_get_format(struct snd_ad1816a *chip, -- unsigned int format, int channels) -+ snd_pcm_format_t format, -+ int channels) - { - unsigned char retval = AD1816A_FMT_LINEAR_8; - diff --git a/queue-3.18/alsa-sb-fix-sparse-warning-wrt-pcm-format-type.patch b/queue-3.18/alsa-sb-fix-sparse-warning-wrt-pcm-format-type.patch deleted file mode 100644 index 411f9f5f6a3..00000000000 --- a/queue-3.18/alsa-sb-fix-sparse-warning-wrt-pcm-format-type.patch +++ /dev/null @@ -1,65 +0,0 @@ -From foo@baz Mon Sep 17 11:45:58 CEST 2018 -From: Takashi Iwai -Date: Wed, 25 Jul 2018 23:19:44 +0200 -Subject: ALSA: sb: Fix sparse warning wrt PCM format type - -From: Takashi Iwai - -[ Upstream commit e5d3765b6c4cb3ba64295a4205a2f68a4e8fe083 ] - -The PCM format type is with __bitwise, and it can't be converted from -integer implicitly. Instead of an ugly cast, declare the function -argument of snd_sb_csp_autoload() with the proper snd_pcm_format_t -type. - -This fixes the sparse warnings like: - sound/isa/sb/sb16_csp.c:743:22: 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 ---- - include/sound/sb16_csp.h | 2 +- - sound/isa/sb/sb16_csp.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - ---- a/include/sound/sb16_csp.h -+++ b/include/sound/sb16_csp.h -@@ -46,7 +46,7 @@ enum { - struct snd_sb_csp_ops { - int (*csp_use) (struct snd_sb_csp * p); - int (*csp_unuse) (struct snd_sb_csp * p); -- int (*csp_autoload) (struct snd_sb_csp * p, int pcm_sfmt, int play_rec_mode); -+ int (*csp_autoload) (struct snd_sb_csp * p, snd_pcm_format_t pcm_sfmt, int play_rec_mode); - int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels); - int (*csp_stop) (struct snd_sb_csp * p); - int (*csp_qsound_transfer) (struct snd_sb_csp * p); ---- a/sound/isa/sb/sb16_csp.c -+++ b/sound/isa/sb/sb16_csp.c -@@ -93,7 +93,7 @@ static int snd_sb_csp_riff_load(struct s - struct snd_sb_csp_microcode __user * code); - static int snd_sb_csp_unload(struct snd_sb_csp * p); - static int snd_sb_csp_load_user(struct snd_sb_csp * p, const unsigned char __user *buf, int size, int load_flags); --static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec_mode); -+static int snd_sb_csp_autoload(struct snd_sb_csp * p, snd_pcm_format_t pcm_sfmt, int play_rec_mode); - static int snd_sb_csp_check_version(struct snd_sb_csp * p); - - static int snd_sb_csp_use(struct snd_sb_csp * p); -@@ -726,7 +726,7 @@ static int snd_sb_csp_firmware_load(stru - * autoload hardware codec if necessary - * return 0 if CSP is loaded and ready to run (p->running != 0) - */ --static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec_mode) -+static int snd_sb_csp_autoload(struct snd_sb_csp * p, snd_pcm_format_t pcm_sfmt, int play_rec_mode) - { - unsigned long flags; - int err = 0; -@@ -736,7 +736,7 @@ static int snd_sb_csp_autoload(struct sn - return -EBUSY; - - /* autoload microcode only if requested hardware codec is not already loaded */ -- if (((1 << pcm_sfmt) & p->acc_format) && (play_rec_mode & p->mode)) { -+ if (((1U << (__force int)pcm_sfmt) & p->acc_format) && (play_rec_mode & p->mode)) { - p->running = SNDRV_SB_CSP_ST_AUTO; - } else { - switch (pcm_sfmt) { diff --git a/queue-3.18/alsa-wss-fix-sparse-warning-wrt-pcm-format-type.patch b/queue-3.18/alsa-wss-fix-sparse-warning-wrt-pcm-format-type.patch deleted file mode 100644 index dc2d4f148ae..00000000000 --- a/queue-3.18/alsa-wss-fix-sparse-warning-wrt-pcm-format-type.patch +++ /dev/null @@ -1,35 +0,0 @@ -From foo@baz Mon Sep 17 11:45:57 CEST 2018 -From: Takashi Iwai -Date: Wed, 25 Jul 2018 23:19:42 +0200 -Subject: ALSA: wss: Fix sparse warning wrt PCM format type - -From: Takashi Iwai - -[ Upstream commit 6be9a60efb401487a4d658ef23d652a9e6860b34 ] - -The PCM format type is with __bitwise, and it can't be converted from -integer implicitly. Instead of an ugly cast, declare the function -argument of snd_wss_get_format() with the proper snd_pcm_format_t -type. - -This fixes the sparse warnings like: - sound/isa/wss/wss_lib.c:551:14: 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/wss/wss_lib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/sound/isa/wss/wss_lib.c -+++ b/sound/isa/wss/wss_lib.c -@@ -541,7 +541,7 @@ static unsigned char snd_wss_get_rate(un - } - - static unsigned char snd_wss_get_format(struct snd_wss *chip, -- int format, -+ snd_pcm_format_t format, - int channels) - { - unsigned char rformat; diff --git a/queue-3.18/series b/queue-3.18/series index 158c87ee995..a52eb0b2f63 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -57,9 +57,6 @@ 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-wss-fix-sparse-warning-wrt-pcm-format-type.patch alsa-sb-fix-pcm-format-bit-calculation.patch alsa-asihpi-fix-pcm-format-notations.patch -alsa-ad1816a-fix-sparse-warning-wrt-pcm-format-type.patch -alsa-sb-fix-sparse-warning-wrt-pcm-format-type.patch mips-warn_on-invalid-dma-cache-maintenance-not-bug_on.patch