Drop drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.6/drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch b/queue-6.6/drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch
deleted file mode 100644 (file)
index 48e0779..0000000
--- a/queue-6.6/drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 07ea395c1063726b3e679d2830eae8eee3186278 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 5 Dec 2023 13:13:36 -0700
-Subject: drm/bridge: Return NULL instead of plain 0 in
- drm_dp_hpd_bridge_register() stub
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-[ Upstream commit 812cc1da7ffd9e178ef66b8a22113be10fba466c ]
-
-sparse complains:
-
-  drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c: note: in included file:
-  include/drm/bridge/aux-bridge.h:29:16: sparse: sparse: Using plain integer as NULL pointer
-
-Return NULL to clear up the warning.
-
-Reported-by: kernel test robot <lkp@intel.com>
-Closes: https://lore.kernel.org/oe-kbuild-all/202312060025.BdeqZrWx-lkp@intel.com/
-Fixes: e560518a6c2e ("drm/bridge: implement generic DP HPD bridge")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
-Reviewed-by: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/20231205-drm_aux_bridge-fixes-v1-3-d242a0ae9df4@kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/drm/bridge/aux-bridge.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/drm/bridge/aux-bridge.h b/include/drm/bridge/aux-bridge.h
-index 874f177381e34..4453906105ca1 100644
---- a/include/drm/bridge/aux-bridge.h
-+++ b/include/drm/bridge/aux-bridge.h
-@@ -41,7 +41,7 @@ static inline int devm_drm_dp_hpd_bridge_add(struct auxiliary_device *adev)
- static inline struct device *drm_dp_hpd_bridge_register(struct device *parent,
-                                                       struct device_node *np)
- {
--      return 0;
-+      return NULL;
- }
- 
- static inline void drm_aux_hpd_bridge_notify(struct device *dev, enum drm_connector_status status)
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index d416117fb652f28014f5f0eb4e26ee18c3dab0eb..91d7d6daa1999a2f7430862eaac750eb8fa3cc2f 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -57,5 +57,4 @@ x86-mmio-disable-kvm-mitigation-when-x86_feature_clear_cpu_buf-is-set.patch
 documentation-hw-vuln-add-documentation-for-rfds.patch
 x86-rfds-mitigate-register-file-data-sampling-rfds.patch
 kvm-x86-export-rfds_no-and-rfds_clear-to-guests.patch
-drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch
 drm-bridge-properly-refcount-dt-nodes-in-aux-bridge-.patch

diff --git a/queue-6.7/drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch b/queue-6.7/drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch
deleted file mode 100644 (file)
index ebb4b08..0000000
--- a/queue-6.7/drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 90aa737d88d467175bd6d1660f5394977fdebb5e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 5 Dec 2023 13:13:36 -0700
-Subject: drm/bridge: Return NULL instead of plain 0 in
- drm_dp_hpd_bridge_register() stub
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-[ Upstream commit 812cc1da7ffd9e178ef66b8a22113be10fba466c ]
-
-sparse complains:
-
-  drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c: note: in included file:
-  include/drm/bridge/aux-bridge.h:29:16: sparse: sparse: Using plain integer as NULL pointer
-
-Return NULL to clear up the warning.
-
-Reported-by: kernel test robot <lkp@intel.com>
-Closes: https://lore.kernel.org/oe-kbuild-all/202312060025.BdeqZrWx-lkp@intel.com/
-Fixes: e560518a6c2e ("drm/bridge: implement generic DP HPD bridge")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
-Reviewed-by: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/20231205-drm_aux_bridge-fixes-v1-3-d242a0ae9df4@kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/drm/bridge/aux-bridge.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/drm/bridge/aux-bridge.h b/include/drm/bridge/aux-bridge.h
-index 874f177381e34..4453906105ca1 100644
---- a/include/drm/bridge/aux-bridge.h
-+++ b/include/drm/bridge/aux-bridge.h
-@@ -41,7 +41,7 @@ static inline int devm_drm_dp_hpd_bridge_add(struct auxiliary_device *adev)
- static inline struct device *drm_dp_hpd_bridge_register(struct device *parent,
-                                                       struct device_node *np)
- {
--      return 0;
-+      return NULL;
- }
- 
- static inline void drm_aux_hpd_bridge_notify(struct device *dev, enum drm_connector_status status)
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 7464df47d1ab9750aeae890f172fdea346070a76..dcb668fa785d0470375502eb1ba7c7066caf9189 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -58,5 +58,4 @@ selftests-mptcp-decrease-bw-in-simult-flows.patch
 exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
 arm-9328-1-mm-try-vma-lock-based-page-fault-handling.patch
 arch-arm-mm-fix-major-fault-accounting-when-retrying.patch
-drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch
 drm-bridge-properly-refcount-dt-nodes-in-aux-bridge-.patch