From: Sasha Levin Date: Wed, 13 Mar 2024 11:21:32 +0000 (-0400) Subject: Drop drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch X-Git-Tag: v6.8.1~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f6583c275d3cd39799a8baab33ba55d5a65b053;p=thirdparty%2Fkernel%2Fstable-queue.git Drop drm-bridge-return-null-instead-of-plain-0-in-drm_dp_.patch Signed-off-by: Sasha Levin --- 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 index 48e0779e1bd..00000000000 --- 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 -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 - -[ 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 -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 -Reviewed-by: Bryan O'Donoghue -Reviewed-by: Guenter Roeck -Signed-off-by: Dmitry Baryshkov -Link: https://patchwork.freedesktop.org/patch/msgid/20231205-drm_aux_bridge-fixes-v1-3-d242a0ae9df4@kernel.org -Signed-off-by: Sasha Levin ---- - 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 d416117fb65..91d7d6daa19 100644 --- 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 index ebb4b089ab3..00000000000 --- 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 -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 - -[ 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 -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 -Reviewed-by: Bryan O'Donoghue -Reviewed-by: Guenter Roeck -Signed-off-by: Dmitry Baryshkov -Link: https://patchwork.freedesktop.org/patch/msgid/20231205-drm_aux_bridge-fixes-v1-3-d242a0ae9df4@kernel.org -Signed-off-by: Sasha Levin ---- - 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 7464df47d1a..dcb668fa785 100644 --- 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