From 0559c2fcb1e1c63a480a26e56758338a738efc3a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Oct 2022 08:42:26 +0200 Subject: [PATCH] drop some unneeded patches --- ...-unused-value-in-vidioc_try_fmt_vid_.patch | 46 ------------------- queue-4.14/series | 1 - ...-unused-value-in-vidioc_try_fmt_vid_.patch | 46 ------------------- queue-4.19/series | 1 - ...-unused-value-in-vidioc_try_fmt_vid_.patch | 46 ------------------- queue-4.9/series | 1 - ...d-can_rx_offload_init_queue-fix-typo.patch | 39 ---------------- ...-unused-value-in-vidioc_try_fmt_vid_.patch | 46 ------------------- queue-5.10/series | 2 - ...d-can_rx_offload_init_queue-fix-typo.patch | 39 ---------------- ...-unused-value-in-vidioc_try_fmt_vid_.patch | 46 ------------------- ...l-don-t-re-define-nand_data_iface_ch.patch | 38 --------------- queue-5.15/series | 3 -- ...d-can_rx_offload_init_queue-fix-typo.patch | 39 ---------------- ...-unused-value-in-vidioc_try_fmt_vid_.patch | 46 ------------------- ...l-don-t-re-define-nand_data_iface_ch.patch | 38 --------------- queue-5.19/series | 3 -- ...-unused-value-in-vidioc_try_fmt_vid_.patch | 46 ------------------- queue-5.4/series | 1 - ...d-can_rx_offload_init_queue-fix-typo.patch | 39 ---------------- ...-unused-value-in-vidioc_try_fmt_vid_.patch | 46 ------------------- ...l-don-t-re-define-nand_data_iface_ch.patch | 38 --------------- queue-6.0/series | 4 -- ...rect-dma_chan-pointer-initialization.patch | 46 ------------------- 24 files changed, 700 deletions(-) delete mode 100644 queue-4.14/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch delete mode 100644 queue-4.19/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch delete mode 100644 queue-4.9/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch delete mode 100644 queue-5.10/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch delete mode 100644 queue-5.10/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch delete mode 100644 queue-5.15/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch delete mode 100644 queue-5.15/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch delete mode 100644 queue-5.15/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch delete mode 100644 queue-5.19/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch delete mode 100644 queue-5.19/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch delete mode 100644 queue-5.19/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch delete mode 100644 queue-5.4/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch delete mode 100644 queue-6.0/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch delete mode 100644 queue-6.0/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch delete mode 100644 queue-6.0/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch delete mode 100644 queue-6.0/spi-s3c64xx-correct-dma_chan-pointer-initialization.patch diff --git a/queue-4.14/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch b/queue-4.14/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch deleted file mode 100644 index 35b59795f4c..00000000000 --- a/queue-4.14/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 480b765b2032ba0589015f1fec84b4596eddc3fc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Jul 2022 18:12:36 +0800 -Subject: media: tm6000: Fix unused value in vidioc_try_fmt_vid_cap() - -From: Zeng Jingxiang - -[ Upstream commit d682869daa23938b5e8919db45c4b5b227749712 ] - -Coverity warns of an unused value: - -assigned_value: Assign the value of the variable f->fmt.pix.field -to field here, but that stored value is overwritten. -before it can be used. -919 field = f->fmt.pix.field; -920 - -value_overwrite: Overwriting previous write to field with -the value of V4L2_FIELD_INTERLACED. -921 field = V4L2_FIELD_INTERLACED; - -Fixes: ed57256f6fe8 ("[media] tm6000: fix G/TRY_FMT") -Signed-off-by: Zeng Jingxiang -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/usb/tm6000/tm6000-video.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c -index ec8c4d2534dc..49c9d0cfa2ec 100644 ---- a/drivers/media/usb/tm6000/tm6000-video.c -+++ b/drivers/media/usb/tm6000/tm6000-video.c -@@ -939,8 +939,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, - return -EINVAL; - } - -- field = f->fmt.pix.field; -- - field = V4L2_FIELD_INTERLACED; - - tm6000_get_std_res(dev); --- -2.35.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 2d7432b8dc8..2af41b6f32a 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -121,7 +121,6 @@ clk-tegra20-fix-refcount-leak-in-tegra20_clock_init.patch hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch hsi-omap_ssi_port-fix-dma_map_sg-error-check.patch media-exynos4-is-fimc-is-add-of_node_put-when-breaki.patch -media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch tty-xilinx_uartps-fix-the-ignore_status.patch media-xilinx-vipp-fix-refcount-leak-in-xvip_graph_dm.patch rdma-rxe-fix-kernel-null-pointer-dereference-error.patch diff --git a/queue-4.19/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch b/queue-4.19/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch deleted file mode 100644 index 0ffa3d23577..00000000000 --- a/queue-4.19/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2fed4a40cad07045f1b6b81ca354da7f765f38b3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Jul 2022 18:12:36 +0800 -Subject: media: tm6000: Fix unused value in vidioc_try_fmt_vid_cap() - -From: Zeng Jingxiang - -[ Upstream commit d682869daa23938b5e8919db45c4b5b227749712 ] - -Coverity warns of an unused value: - -assigned_value: Assign the value of the variable f->fmt.pix.field -to field here, but that stored value is overwritten. -before it can be used. -919 field = f->fmt.pix.field; -920 - -value_overwrite: Overwriting previous write to field with -the value of V4L2_FIELD_INTERLACED. -921 field = V4L2_FIELD_INTERLACED; - -Fixes: ed57256f6fe8 ("[media] tm6000: fix G/TRY_FMT") -Signed-off-by: Zeng Jingxiang -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/usb/tm6000/tm6000-video.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c -index 62f012841971..102d55d0d067 100644 ---- a/drivers/media/usb/tm6000/tm6000-video.c -+++ b/drivers/media/usb/tm6000/tm6000-video.c -@@ -926,8 +926,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, - return -EINVAL; - } - -- field = f->fmt.pix.field; -- - field = V4L2_FIELD_INTERLACED; - - tm6000_get_std_res(dev); --- -2.35.1 - diff --git a/queue-4.19/series b/queue-4.19/series index ff888d177da..9e397519de5 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -129,7 +129,6 @@ sbitmap-fix-possible-io-hung-due-to-lost-wakeup.patch hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch hsi-omap_ssi_port-fix-dma_map_sg-error-check.patch media-exynos4-is-fimc-is-add-of_node_put-when-breaki.patch -media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch tty-xilinx_uartps-fix-the-ignore_status.patch media-xilinx-vipp-fix-refcount-leak-in-xvip_graph_dm.patch rdma-rxe-fix-kernel-null-pointer-dereference-error.patch diff --git a/queue-4.9/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch b/queue-4.9/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch deleted file mode 100644 index 01485d697a9..00000000000 --- a/queue-4.9/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b289272a455418128d1674cda530d69002a0036d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Jul 2022 18:12:36 +0800 -Subject: media: tm6000: Fix unused value in vidioc_try_fmt_vid_cap() - -From: Zeng Jingxiang - -[ Upstream commit d682869daa23938b5e8919db45c4b5b227749712 ] - -Coverity warns of an unused value: - -assigned_value: Assign the value of the variable f->fmt.pix.field -to field here, but that stored value is overwritten. -before it can be used. -919 field = f->fmt.pix.field; -920 - -value_overwrite: Overwriting previous write to field with -the value of V4L2_FIELD_INTERLACED. -921 field = V4L2_FIELD_INTERLACED; - -Fixes: ed57256f6fe8 ("[media] tm6000: fix G/TRY_FMT") -Signed-off-by: Zeng Jingxiang -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/usb/tm6000/tm6000-video.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c -index dee7e7d3d47d..d6e909aa4bbe 100644 ---- a/drivers/media/usb/tm6000/tm6000-video.c -+++ b/drivers/media/usb/tm6000/tm6000-video.c -@@ -944,8 +944,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, - return -EINVAL; - } - -- field = f->fmt.pix.field; -- - field = V4L2_FIELD_INTERLACED; - - tm6000_get_std_res(dev); --- -2.35.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 71ea0a0bfbb..3e280e40471 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -95,7 +95,6 @@ clk-tegra20-fix-refcount-leak-in-tegra20_clock_init.patch hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch hsi-omap_ssi_port-fix-dma_map_sg-error-check.patch media-exynos4-is-fimc-is-add-of_node_put-when-breaki.patch -media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch tty-xilinx_uartps-fix-the-ignore_status.patch media-xilinx-vipp-fix-refcount-leak-in-xvip_graph_dm.patch rdma-rxe-fix-kernel-null-pointer-dereference-error.patch diff --git a/queue-5.10/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch b/queue-5.10/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch deleted file mode 100644 index 3eb6524c119..00000000000 --- a/queue-5.10/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7cd0eb7815455bd37b0d559d76a98e8ad03200b5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 Aug 2022 21:38:00 +0200 -Subject: can: rx-offload: can_rx_offload_init_queue(): fix typo -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Marc Kleine-Budde - -[ Upstream commit 766108d91246530d31b42765046f7ec2d1e42581 ] - -Fix typo "rounted" -> "rounded". - -Link: https://lore.kernel.org/all/20220811093617.1861938-2-mkl@pengutronix.de -Fixes: d254586c3453 ("can: rx-offload: Add support for HW fifo based irq offloading") -Reported-by: Uwe Kleine-König -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Sasha Levin ---- - drivers/net/can/dev/rx-offload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/can/dev/rx-offload.c b/drivers/net/can/dev/rx-offload.c -index 6e95193b215b..cee6ceae2158 100644 ---- a/drivers/net/can/dev/rx-offload.c -+++ b/drivers/net/can/dev/rx-offload.c -@@ -307,7 +307,7 @@ static int can_rx_offload_init_queue(struct net_device *dev, - { - offload->dev = dev; - -- /* Limit queue len to 4x the weight (rounted to next power of two) */ -+ /* Limit queue len to 4x the weight (rounded to next power of two) */ - offload->skb_queue_len_max = 2 << fls(weight); - offload->skb_queue_len_max *= 4; - skb_queue_head_init(&offload->skb_queue); --- -2.35.1 - diff --git a/queue-5.10/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch b/queue-5.10/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch deleted file mode 100644 index 152507a0986..00000000000 --- a/queue-5.10/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d767858779c1055ab7996f631754d5316dcfc1b6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Jul 2022 18:12:36 +0800 -Subject: media: tm6000: Fix unused value in vidioc_try_fmt_vid_cap() - -From: Zeng Jingxiang - -[ Upstream commit d682869daa23938b5e8919db45c4b5b227749712 ] - -Coverity warns of an unused value: - -assigned_value: Assign the value of the variable f->fmt.pix.field -to field here, but that stored value is overwritten. -before it can be used. -919 field = f->fmt.pix.field; -920 - -value_overwrite: Overwriting previous write to field with -the value of V4L2_FIELD_INTERLACED. -921 field = V4L2_FIELD_INTERLACED; - -Fixes: ed57256f6fe8 ("[media] tm6000: fix G/TRY_FMT") -Signed-off-by: Zeng Jingxiang -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/usb/tm6000/tm6000-video.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c -index 01071e6cd757..b01d3aa6d037 100644 ---- a/drivers/media/usb/tm6000/tm6000-video.c -+++ b/drivers/media/usb/tm6000/tm6000-video.c -@@ -918,8 +918,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, - return -EINVAL; - } - -- field = f->fmt.pix.field; -- - field = V4L2_FIELD_INTERLACED; - - tm6000_get_std_res(dev); --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 097508078fd..1622defecf0 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -110,7 +110,6 @@ wifi-rtl8xxxu-tighten-bounds-checking-in-rtl8xxxu_re.patch selftests-xsk-avoid-use-after-free-on-ctx.patch spi-qup-add-missing-clk_disable_unprepare-on-error-i.patch spi-qup-add-missing-clk_disable_unprepare-on-error-i.patch-14793 -can-rx-offload-can_rx_offload_init_queue-fix-typo.patch wifi-rtl8xxxu-fix-skb-misuse-in-tx-queue-selection.patch spi-meson-spicc-do-not-rely-on-busy-flag-in-pow2-clk.patch bpf-btf-fix-truncated-last_member_type_id-in-btf_str.patch @@ -219,7 +218,6 @@ clk-qcom-gcc-sdm660-replace-usage-of-parent_names.patch clk-qcom-gcc-sdm660-use-array_size-for-num_parents.patch clk-qcom-gcc-sdm660-use-floor-ops-for-sdcc1-clock.patch media-exynos4-is-fimc-is-add-of_node_put-when-breaki.patch -media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch tty-xilinx_uartps-fix-the-ignore_status.patch media-meson-vdec-add-missing-clk_disable_unprepare-o.patch media-xilinx-vipp-fix-refcount-leak-in-xvip_graph_dm.patch diff --git a/queue-5.15/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch b/queue-5.15/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch deleted file mode 100644 index 5577377ac4f..00000000000 --- a/queue-5.15/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 944840c81463d967d2ee59a3322f596501b7ac33 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 Aug 2022 21:38:00 +0200 -Subject: can: rx-offload: can_rx_offload_init_queue(): fix typo -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Marc Kleine-Budde - -[ Upstream commit 766108d91246530d31b42765046f7ec2d1e42581 ] - -Fix typo "rounted" -> "rounded". - -Link: https://lore.kernel.org/all/20220811093617.1861938-2-mkl@pengutronix.de -Fixes: d254586c3453 ("can: rx-offload: Add support for HW fifo based irq offloading") -Reported-by: Uwe Kleine-König -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Sasha Levin ---- - drivers/net/can/dev/rx-offload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/can/dev/rx-offload.c b/drivers/net/can/dev/rx-offload.c -index 37b0cc65237b..90ef0429fda3 100644 ---- a/drivers/net/can/dev/rx-offload.c -+++ b/drivers/net/can/dev/rx-offload.c -@@ -328,7 +328,7 @@ static int can_rx_offload_init_queue(struct net_device *dev, - { - offload->dev = dev; - -- /* Limit queue len to 4x the weight (rounted to next power of two) */ -+ /* Limit queue len to 4x the weight (rounded to next power of two) */ - offload->skb_queue_len_max = 2 << fls(weight); - offload->skb_queue_len_max *= 4; - skb_queue_head_init(&offload->skb_queue); --- -2.35.1 - diff --git a/queue-5.15/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch b/queue-5.15/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch deleted file mode 100644 index f499f31d9d3..00000000000 --- a/queue-5.15/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7c53bdcd01fcf761c8aec9242f3e1177ba1dcdf5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Jul 2022 18:12:36 +0800 -Subject: media: tm6000: Fix unused value in vidioc_try_fmt_vid_cap() - -From: Zeng Jingxiang - -[ Upstream commit d682869daa23938b5e8919db45c4b5b227749712 ] - -Coverity warns of an unused value: - -assigned_value: Assign the value of the variable f->fmt.pix.field -to field here, but that stored value is overwritten. -before it can be used. -919 field = f->fmt.pix.field; -920 - -value_overwrite: Overwriting previous write to field with -the value of V4L2_FIELD_INTERLACED. -921 field = V4L2_FIELD_INTERLACED; - -Fixes: ed57256f6fe8 ("[media] tm6000: fix G/TRY_FMT") -Signed-off-by: Zeng Jingxiang -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/usb/tm6000/tm6000-video.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c -index e293f6f3d1bc..f80734dc4902 100644 ---- a/drivers/media/usb/tm6000/tm6000-video.c -+++ b/drivers/media/usb/tm6000/tm6000-video.c -@@ -916,8 +916,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, - return -EINVAL; - } - -- field = f->fmt.pix.field; -- - field = V4L2_FIELD_INTERLACED; - - tm6000_get_std_res(dev); --- -2.35.1 - diff --git a/queue-5.15/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch b/queue-5.15/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch deleted file mode 100644 index 94a2844e397..00000000000 --- a/queue-5.15/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 383f663eb3caf52cf57718947960aa9b21c48645 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 3 Jul 2022 01:12:24 +0200 -Subject: mtd: rawnand: intel: Don't re-define NAND_DATA_IFACE_CHECK_ONLY - -From: Martin Blumenstingl - -[ Upstream commit ebe0cd60fcffd499f8020fde9b3b74acba9c22af ] - -NAND_DATA_IFACE_CHECK_ONLY is already defined in -include/linux/mtd/rawnand.h which is also included by the driver. Drop -the re-definition from the intel-nand-controller driver. - -Fixes: 0b1039f016e8a3 ("mtd: rawnand: Add NAND controller support on Intel LGM SoC") -Signed-off-by: Martin Blumenstingl -Signed-off-by: Miquel Raynal -Link: https://lore.kernel.org/linux-mtd/20220702231227.1579176-6-martin.blumenstingl@googlemail.com -Signed-off-by: Sasha Levin ---- - drivers/mtd/nand/raw/intel-nand-controller.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/mtd/nand/raw/intel-nand-controller.c b/drivers/mtd/nand/raw/intel-nand-controller.c -index 056835fd4562..3df16d5ecae8 100644 ---- a/drivers/mtd/nand/raw/intel-nand-controller.c -+++ b/drivers/mtd/nand/raw/intel-nand-controller.c -@@ -100,8 +100,6 @@ - - #define HSNAND_ECC_OFFSET 0x008 - --#define NAND_DATA_IFACE_CHECK_ONLY -1 -- - #define MAX_CS 2 - - #define USEC_PER_SEC 1000000L --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 2a2cfe490c2..ccf37889d51 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -169,7 +169,6 @@ wifi-rtw88-add-missing-destroy_workqueue-on-error-pa.patch selftests-xsk-avoid-use-after-free-on-ctx.patch spi-qup-add-missing-clk_disable_unprepare-on-error-i.patch spi-qup-add-missing-clk_disable_unprepare-on-error-i.patch-20716 -can-rx-offload-can_rx_offload_init_queue-fix-typo.patch wifi-rtl8xxxu-fix-skb-misuse-in-tx-queue-selection.patch spi-meson-spicc-do-not-rely-on-busy-flag-in-pow2-clk.patch bpf-btf-fix-truncated-last_member_type_id-in-btf_str.patch @@ -300,7 +299,6 @@ hsi-omap_ssi_port-fix-dma_map_sg-error-check.patch clk-qcom-gcc-sdm660-use-array_size-for-num_parents.patch clk-qcom-gcc-sdm660-use-floor-ops-for-sdcc1-clock.patch media-exynos4-is-fimc-is-add-of_node_put-when-breaki.patch -media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch tty-xilinx_uartps-fix-the-ignore_status.patch media-meson-vdec-add-missing-clk_disable_unprepare-o.patch media-uvcvideo-fix-memory-leak-in-uvc_gpio_parse.patch @@ -345,7 +343,6 @@ phy-amlogic-phy-meson-axg-mipi-pcie-analog-hold-refe.patch phy-phy-mtk-tphy-fix-the-phy-type-setting-issue.patch mtd-rawnand-intel-read-the-chip-select-line-from-the.patch mtd-rawnand-intel-remove-undocumented-compatible-str.patch -mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch mtd-rawnand-fsl_elbc-fix-none-ecc-mode.patch rdma-irdma-align-ae-id-codes-to-correct-flush-code-a.patch rdma-srp-fix-srp_abort.patch diff --git a/queue-5.19/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch b/queue-5.19/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch deleted file mode 100644 index 6582545d0fa..00000000000 --- a/queue-5.19/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9cbdc56debb7ce393e3bec48ac36749bdd52c767 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 Aug 2022 21:38:00 +0200 -Subject: can: rx-offload: can_rx_offload_init_queue(): fix typo -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Marc Kleine-Budde - -[ Upstream commit 766108d91246530d31b42765046f7ec2d1e42581 ] - -Fix typo "rounted" -> "rounded". - -Link: https://lore.kernel.org/all/20220811093617.1861938-2-mkl@pengutronix.de -Fixes: d254586c3453 ("can: rx-offload: Add support for HW fifo based irq offloading") -Reported-by: Uwe Kleine-König -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Sasha Levin ---- - drivers/net/can/dev/rx-offload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/can/dev/rx-offload.c b/drivers/net/can/dev/rx-offload.c -index a32a01c172d4..ad8eb243fe78 100644 ---- a/drivers/net/can/dev/rx-offload.c -+++ b/drivers/net/can/dev/rx-offload.c -@@ -329,7 +329,7 @@ static int can_rx_offload_init_queue(struct net_device *dev, - { - offload->dev = dev; - -- /* Limit queue len to 4x the weight (rounted to next power of two) */ -+ /* Limit queue len to 4x the weight (rounded to next power of two) */ - offload->skb_queue_len_max = 2 << fls(weight); - offload->skb_queue_len_max *= 4; - skb_queue_head_init(&offload->skb_queue); --- -2.35.1 - diff --git a/queue-5.19/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch b/queue-5.19/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch deleted file mode 100644 index de95e8b98ae..00000000000 --- a/queue-5.19/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d11aa69d6362d17ea9b53bb0517cc00243a49428 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Jul 2022 18:12:36 +0800 -Subject: media: tm6000: Fix unused value in vidioc_try_fmt_vid_cap() - -From: Zeng Jingxiang - -[ Upstream commit d682869daa23938b5e8919db45c4b5b227749712 ] - -Coverity warns of an unused value: - -assigned_value: Assign the value of the variable f->fmt.pix.field -to field here, but that stored value is overwritten. -before it can be used. -919 field = f->fmt.pix.field; -920 - -value_overwrite: Overwriting previous write to field with -the value of V4L2_FIELD_INTERLACED. -921 field = V4L2_FIELD_INTERLACED; - -Fixes: ed57256f6fe8 ("[media] tm6000: fix G/TRY_FMT") -Signed-off-by: Zeng Jingxiang -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/usb/tm6000/tm6000-video.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c -index d855a19551f3..e06ed21edbdd 100644 ---- a/drivers/media/usb/tm6000/tm6000-video.c -+++ b/drivers/media/usb/tm6000/tm6000-video.c -@@ -916,8 +916,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, - return -EINVAL; - } - -- field = f->fmt.pix.field; -- - field = V4L2_FIELD_INTERLACED; - - tm6000_get_std_res(dev); --- -2.35.1 - diff --git a/queue-5.19/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch b/queue-5.19/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch deleted file mode 100644 index dade0be7c9a..00000000000 --- a/queue-5.19/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3fe8296de501c453d1def2b9ba3a3d17b1499614 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 3 Jul 2022 01:12:24 +0200 -Subject: mtd: rawnand: intel: Don't re-define NAND_DATA_IFACE_CHECK_ONLY - -From: Martin Blumenstingl - -[ Upstream commit ebe0cd60fcffd499f8020fde9b3b74acba9c22af ] - -NAND_DATA_IFACE_CHECK_ONLY is already defined in -include/linux/mtd/rawnand.h which is also included by the driver. Drop -the re-definition from the intel-nand-controller driver. - -Fixes: 0b1039f016e8a3 ("mtd: rawnand: Add NAND controller support on Intel LGM SoC") -Signed-off-by: Martin Blumenstingl -Signed-off-by: Miquel Raynal -Link: https://lore.kernel.org/linux-mtd/20220702231227.1579176-6-martin.blumenstingl@googlemail.com -Signed-off-by: Sasha Levin ---- - drivers/mtd/nand/raw/intel-nand-controller.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/mtd/nand/raw/intel-nand-controller.c b/drivers/mtd/nand/raw/intel-nand-controller.c -index 056835fd4562..3df16d5ecae8 100644 ---- a/drivers/mtd/nand/raw/intel-nand-controller.c -+++ b/drivers/mtd/nand/raw/intel-nand-controller.c -@@ -100,8 +100,6 @@ - - #define HSNAND_ECC_OFFSET 0x008 - --#define NAND_DATA_IFACE_CHECK_ONLY -1 -- - #define MAX_CS 2 - - #define USEC_PER_SEC 1000000L --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index 3cab85a782f..95d514aafb1 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -232,7 +232,6 @@ wifi-rtw88-add-missing-destroy_workqueue-on-error-pa.patch selftests-xsk-avoid-use-after-free-on-ctx.patch spi-qup-add-missing-clk_disable_unprepare-on-error-i.patch spi-qup-add-missing-clk_disable_unprepare-on-error-i.patch-30157 -can-rx-offload-can_rx_offload_init_queue-fix-typo.patch wifi-rtl8xxxu-fix-skb-misuse-in-tx-queue-selection.patch spi-meson-spicc-do-not-rely-on-busy-flag-in-pow2-clk.patch bpf-btf-fix-truncated-last_member_type_id-in-btf_str.patch @@ -413,7 +412,6 @@ hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch hsi-omap_ssi_port-fix-dma_map_sg-error-check.patch clk-qcom-gcc-sdm660-use-floor-ops-for-sdcc1-clock.patch media-exynos4-is-fimc-is-add-of_node_put-when-breaki.patch -media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch tty-xilinx_uartps-fix-the-ignore_status.patch media-amphion-insert-picture-startcode-after-seek-fo.patch media-amphion-adjust-the-encoder-s-value-range-of-go.patch @@ -471,7 +469,6 @@ phy-amlogic-phy-meson-axg-mipi-pcie-analog-hold-refe.patch phy-phy-mtk-tphy-fix-the-phy-type-setting-issue.patch mtd-rawnand-intel-read-the-chip-select-line-from-the.patch mtd-rawnand-intel-remove-undocumented-compatible-str.patch -mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch mtd-rawnand-fsl_elbc-fix-none-ecc-mode.patch rdma-irdma-align-ae-id-codes-to-correct-flush-code-a.patch rdma-irdma-validate-udata-inlen-and-outlen.patch diff --git a/queue-5.4/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch b/queue-5.4/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch deleted file mode 100644 index 4100d83a74c..00000000000 --- a/queue-5.4/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a46b1abb1a9af88e5ee5642bed1c667f29b2961e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Jul 2022 18:12:36 +0800 -Subject: media: tm6000: Fix unused value in vidioc_try_fmt_vid_cap() - -From: Zeng Jingxiang - -[ Upstream commit d682869daa23938b5e8919db45c4b5b227749712 ] - -Coverity warns of an unused value: - -assigned_value: Assign the value of the variable f->fmt.pix.field -to field here, but that stored value is overwritten. -before it can be used. -919 field = f->fmt.pix.field; -920 - -value_overwrite: Overwriting previous write to field with -the value of V4L2_FIELD_INTERLACED. -921 field = V4L2_FIELD_INTERLACED; - -Fixes: ed57256f6fe8 ("[media] tm6000: fix G/TRY_FMT") -Signed-off-by: Zeng Jingxiang -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/usb/tm6000/tm6000-video.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c -index 8874b0b922ee..3ea7617f1fe9 100644 ---- a/drivers/media/usb/tm6000/tm6000-video.c -+++ b/drivers/media/usb/tm6000/tm6000-video.c -@@ -918,8 +918,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, - return -EINVAL; - } - -- field = f->fmt.pix.field; -- - field = V4L2_FIELD_INTERLACED; - - tm6000_get_std_res(dev); --- -2.35.1 - diff --git a/queue-5.4/series b/queue-5.4/series index fd854c5762b..0f56f99536c 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -131,7 +131,6 @@ sbitmap-fix-possible-io-hung-due-to-lost-wakeup.patch hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch hsi-omap_ssi_port-fix-dma_map_sg-error-check.patch media-exynos4-is-fimc-is-add-of_node_put-when-breaki.patch -media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch tty-xilinx_uartps-fix-the-ignore_status.patch media-xilinx-vipp-fix-refcount-leak-in-xvip_graph_dm.patch rdma-rxe-fix-kernel-null-pointer-dereference-error.patch diff --git a/queue-6.0/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch b/queue-6.0/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch deleted file mode 100644 index 85b7227e703..00000000000 --- a/queue-6.0/can-rx-offload-can_rx_offload_init_queue-fix-typo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8b891242bff602c5046eed9d740e3164ed349362 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 Aug 2022 21:38:00 +0200 -Subject: can: rx-offload: can_rx_offload_init_queue(): fix typo -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Marc Kleine-Budde - -[ Upstream commit 766108d91246530d31b42765046f7ec2d1e42581 ] - -Fix typo "rounted" -> "rounded". - -Link: https://lore.kernel.org/all/20220811093617.1861938-2-mkl@pengutronix.de -Fixes: d254586c3453 ("can: rx-offload: Add support for HW fifo based irq offloading") -Reported-by: Uwe Kleine-König -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Sasha Levin ---- - drivers/net/can/dev/rx-offload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/can/dev/rx-offload.c b/drivers/net/can/dev/rx-offload.c -index a32a01c172d4..ad8eb243fe78 100644 ---- a/drivers/net/can/dev/rx-offload.c -+++ b/drivers/net/can/dev/rx-offload.c -@@ -329,7 +329,7 @@ static int can_rx_offload_init_queue(struct net_device *dev, - { - offload->dev = dev; - -- /* Limit queue len to 4x the weight (rounted to next power of two) */ -+ /* Limit queue len to 4x the weight (rounded to next power of two) */ - offload->skb_queue_len_max = 2 << fls(weight); - offload->skb_queue_len_max *= 4; - skb_queue_head_init(&offload->skb_queue); --- -2.35.1 - diff --git a/queue-6.0/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch b/queue-6.0/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch deleted file mode 100644 index eb996f1610d..00000000000 --- a/queue-6.0/media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3f152ebafc7baec42fe6e5e9bfca3a88e179f098 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Jul 2022 18:12:36 +0800 -Subject: media: tm6000: Fix unused value in vidioc_try_fmt_vid_cap() - -From: Zeng Jingxiang - -[ Upstream commit d682869daa23938b5e8919db45c4b5b227749712 ] - -Coverity warns of an unused value: - -assigned_value: Assign the value of the variable f->fmt.pix.field -to field here, but that stored value is overwritten. -before it can be used. -919 field = f->fmt.pix.field; -920 - -value_overwrite: Overwriting previous write to field with -the value of V4L2_FIELD_INTERLACED. -921 field = V4L2_FIELD_INTERLACED; - -Fixes: ed57256f6fe8 ("[media] tm6000: fix G/TRY_FMT") -Signed-off-by: Zeng Jingxiang -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/usb/tm6000/tm6000-video.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c -index d855a19551f3..e06ed21edbdd 100644 ---- a/drivers/media/usb/tm6000/tm6000-video.c -+++ b/drivers/media/usb/tm6000/tm6000-video.c -@@ -916,8 +916,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, - return -EINVAL; - } - -- field = f->fmt.pix.field; -- - field = V4L2_FIELD_INTERLACED; - - tm6000_get_std_res(dev); --- -2.35.1 - diff --git a/queue-6.0/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch b/queue-6.0/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch deleted file mode 100644 index c692443dd34..00000000000 --- a/queue-6.0/mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 13b832c23c488548eeea4be050a9f5e454a82a9b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 3 Jul 2022 01:12:24 +0200 -Subject: mtd: rawnand: intel: Don't re-define NAND_DATA_IFACE_CHECK_ONLY - -From: Martin Blumenstingl - -[ Upstream commit ebe0cd60fcffd499f8020fde9b3b74acba9c22af ] - -NAND_DATA_IFACE_CHECK_ONLY is already defined in -include/linux/mtd/rawnand.h which is also included by the driver. Drop -the re-definition from the intel-nand-controller driver. - -Fixes: 0b1039f016e8a3 ("mtd: rawnand: Add NAND controller support on Intel LGM SoC") -Signed-off-by: Martin Blumenstingl -Signed-off-by: Miquel Raynal -Link: https://lore.kernel.org/linux-mtd/20220702231227.1579176-6-martin.blumenstingl@googlemail.com -Signed-off-by: Sasha Levin ---- - drivers/mtd/nand/raw/intel-nand-controller.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/mtd/nand/raw/intel-nand-controller.c b/drivers/mtd/nand/raw/intel-nand-controller.c -index 056835fd4562..3df16d5ecae8 100644 ---- a/drivers/mtd/nand/raw/intel-nand-controller.c -+++ b/drivers/mtd/nand/raw/intel-nand-controller.c -@@ -100,8 +100,6 @@ - - #define HSNAND_ECC_OFFSET 0x008 - --#define NAND_DATA_IFACE_CHECK_ONLY -1 -- - #define MAX_CS 2 - - #define USEC_PER_SEC 1000000L --- -2.35.1 - diff --git a/queue-6.0/series b/queue-6.0/series index e1cbe5c16fb..2ca9f600fad 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -231,7 +231,6 @@ wifi-ath10k-set-tx-credit-to-one-for-wcn3990-snoc-ba.patch wifi-ath10k-add-peer-map-clean-up-for-peer-delete-in.patch bpf-cleanup-check_refcount_ok.patch bpf-fix-ref_obj_id-for-dynptr-data-slices-in-verifie.patch -spi-s3c64xx-correct-dma_chan-pointer-initialization.patch leds-lm3601x-don-t-use-mutex-after-it-was-destroyed.patch tsnep-fix-tsnep_info_tx_time-register-define.patch net-prestera-cache-port-state-for-non-phylink-ports-.patch @@ -267,7 +266,6 @@ selftests-xsk-avoid-use-after-free-on-ctx.patch wifi-mac80211-mlme-assign-link-address-correctly.patch spi-qup-add-missing-clk_disable_unprepare-on-error-i.patch spi-qup-add-missing-clk_disable_unprepare-on-error-i.patch-31329 -can-rx-offload-can_rx_offload_init_queue-fix-typo.patch wifi-rtl8xxxu-fix-skb-misuse-in-tx-queue-selection.patch spi-meson-spicc-do-not-rely-on-busy-flag-in-pow2-clk.patch bpf-btf-fix-truncated-last_member_type_id-in-btf_str.patch @@ -485,7 +483,6 @@ hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch hsi-omap_ssi_port-fix-dma_map_sg-error-check.patch clk-qcom-gcc-sdm660-use-floor-ops-for-sdcc1-clock.patch media-exynos4-is-fimc-is-add-of_node_put-when-breaki.patch -media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch media-airspy-fix-memory-leak-in-airspy-probe.patch tty-xilinx_uartps-check-clk_enable-return-value.patch tty-xilinx_uartps-fix-the-ignore_status.patch @@ -533,7 +530,6 @@ phy-amlogic-phy-meson-axg-mipi-pcie-analog-hold-refe.patch phy-phy-mtk-tphy-fix-the-phy-type-setting-issue.patch mtd-rawnand-intel-read-the-chip-select-line-from-the.patch mtd-rawnand-intel-remove-undocumented-compatible-str.patch -mtd-rawnand-intel-don-t-re-define-nand_data_iface_ch.patch mtd-rawnand-fsl_elbc-fix-none-ecc-mode.patch rdma-irdma-align-ae-id-codes-to-correct-flush-code-a.patch rdma-irdma-validate-udata-inlen-and-outlen.patch diff --git a/queue-6.0/spi-s3c64xx-correct-dma_chan-pointer-initialization.patch b/queue-6.0/spi-s3c64xx-correct-dma_chan-pointer-initialization.patch deleted file mode 100644 index 8e02226dabe..00000000000 --- a/queue-6.0/spi-s3c64xx-correct-dma_chan-pointer-initialization.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2f0cd3195ee34088aea2f7664de5f06697523565 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 8 Aug 2022 09:48:51 +0900 -Subject: spi: s3c64xx: correct dma_chan pointer initialization - -From: Chanho Park - -[ Upstream commit dad57a510db9423a4128ae6565854e999cebac51 ] - -Use NULL for dma channel pointer initialization instead of plain integer. - -sparse warnings: (new ones prefixed by >>) ->> drivers/spi/spi-s3c64xx.c:387:34: sparse: sparse: Using plain integer as NULL pointer - drivers/spi/spi-s3c64xx.c:388:34: sparse: sparse: Using plain integer as NULL pointer - -Reported-by: kernel test robot -Fixes: 82295bc0d192 ("spi: s3c64xx: move dma_release_channel to unprepare") -Fixes: f52b03c70744 ("spi: s3c64xx: requests spi-dma channel only during data transfer") -Signed-off-by: Chanho Park -Reviewed-by: Andi Shyti -Reviewed-by: Krzysztof Kozlowski -Link: https://lore.kernel.org/r/20220808004851.25122-1-chanho61.park@samsung.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-s3c64xx.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c -index 7f346866614a..651c35dd9124 100644 ---- a/drivers/spi/spi-s3c64xx.c -+++ b/drivers/spi/spi-s3c64xx.c -@@ -389,8 +389,8 @@ static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi) - if (sdd->rx_dma.ch && sdd->tx_dma.ch) { - dma_release_channel(sdd->rx_dma.ch); - dma_release_channel(sdd->tx_dma.ch); -- sdd->rx_dma.ch = 0; -- sdd->tx_dma.ch = 0; -+ sdd->rx_dma.ch = NULL; -+ sdd->tx_dma.ch = NULL; - } - - return 0; --- -2.35.1 - -- 2.47.3