drop queue-5.10/interconnect-qcom-osm-l3-replace-custom-implementati.patch

diff --git a/queue-5.10/interconnect-qcom-osm-l3-replace-custom-implementati.patch b/queue-5.10/interconnect-qcom-osm-l3-replace-custom-implementati.patch
deleted file mode 100644 (file)
index 09d1869..0000000
--- a/queue-5.10/interconnect-qcom-osm-l3-replace-custom-implementati.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 90a5b29a481739bfc3122204a99938738ab5927c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 20 Sep 2023 18:49:27 +0300
-Subject: interconnect: qcom: osm-l3: Replace custom implementation of
- COUNT_ARGS()
-
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-
-[ Upstream commit 577a3c5af1fe87b65931ea94d5515266da301f56 ]
-
-Replace custom and non-portable implementation of COUNT_ARGS().
-
-Fixes: 5bc9900addaf ("interconnect: qcom: Add OSM L3 interconnect provider support")
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Link: https://lore.kernel.org/r/20230920154927.2090732-1-andriy.shevchenko@linux.intel.com
-Signed-off-by: Georgi Djakov <djakov@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/interconnect/qcom/osm-l3.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/interconnect/qcom/osm-l3.c b/drivers/interconnect/qcom/osm-l3.c
-index 08a282d573203..f7407b930d23c 100644
---- a/drivers/interconnect/qcom/osm-l3.c
-+++ b/drivers/interconnect/qcom/osm-l3.c
-@@ -3,6 +3,7 @@
-  * Copyright (c) 2020, The Linux Foundation. All rights reserved.
-  */
- 
-+#include <linux/args.h>
- #include <linux/bitfield.h>
- #include <linux/clk.h>
- #include <linux/interconnect-provider.h>
-@@ -77,7 +78,7 @@ struct qcom_icc_desc {
-               .name = #_name,                                         \
-               .id = _id,                                              \
-               .buswidth = _buswidth,                                  \
--              .num_links = ARRAY_SIZE(((int[]){ __VA_ARGS__ })),      \
-+              .num_links = COUNT_ARGS(__VA_ARGS__),                   \
-               .links = { __VA_ARGS__ },                               \
-       }
- 
--- 
-2.42.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index a450499a5318447ecc0298ed20f8d1c06c01bfcf..fd892ab54e7a1c2fb3d5c412d4aa5653674e56e6 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -131,7 +131,6 @@ dmaengine-pxa_dma-remove-an-erroneous-bug_on-in-pxad.patch
 f2fs-fix-to-initialize-map.m_pblk-in-f2fs_precache_e.patch
 interconnect-qcom-sc7180-retire-define_qbcm.patch
 interconnect-qcom-sc7180-set-acv-enable_mask.patch
-interconnect-qcom-osm-l3-replace-custom-implementati.patch
 modpost-fix-tee-module_device_table-built-on-big-end.patch
 powerpc-40x-remove-stale-pte_atomic_updates-macro.patch
 powerpc-xive-fix-endian-conversion-size.patch