| Message ID | 20240511-fix-aux-hpd-stubs-v1-1-98dae71dfaec@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 51474ab44abf907023a8a875e799b07de461e466 |
| Headers | show |
| Series | drm/bridge: aux-hpd-bridge: correct devm_drm_dp_hpd_bridge_add() stub | expand |
On Sat, May 11, 2024 at 11:54:30AM +0300, Dmitry Baryshkov wrote: > If CONFIG_DRM_AUX_HPD_BRIDGE is not enabled, the aux-bridge.h header > provides a stub for the bridge's functions. Correct the arguments list > of one of those stubs to match the argument list of the non-stubbed > function. > > Fixes: e5ca263508f7 ("drm/bridge: aux-hpd: separate allocation and registration") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202405110428.TMCfb1Ut-lkp@intel.com/ > Cc: Johan Hovold <johan+linaro@kernel.org> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > include/drm/bridge/aux-bridge.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) You beat me to it, thanks! I'll take this through the usb-next tree as we have a commit there that requires this to build properly on 0-day testing. greg k-h
On Sat, May 11, 2024 at 11:54:30AM +0300, Dmitry Baryshkov wrote: > If CONFIG_DRM_AUX_HPD_BRIDGE is not enabled, the aux-bridge.h header > provides a stub for the bridge's functions. Correct the arguments list > of one of those stubs to match the argument list of the non-stubbed > function. > > Fixes: e5ca263508f7 ("drm/bridge: aux-hpd: separate allocation and registration") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202405110428.TMCfb1Ut-lkp@intel.com/ > Cc: Johan Hovold <johan+linaro@kernel.org> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Thanks for fixing this. This one should also be backported (e.g. as the patch that can trigger this probably also should be backported to 6.8 [1]): Cc: stable@vger.kernel.org # 6.8 Reviewed-by: Johan Hovold <johan+linaro@kernel.org> Johan [1] https://lore.kernel.org/r/20240424-qc-pmic-typec-hpd-split-v4-1-f7e10d147443@linaro.org
diff --git a/include/drm/bridge/aux-bridge.h b/include/drm/bridge/aux-bridge.h index 4453906105ca..c2f5a855512f 100644 --- a/include/drm/bridge/aux-bridge.h +++ b/include/drm/bridge/aux-bridge.h @@ -33,7 +33,7 @@ static inline struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct devic return NULL; } -static inline int devm_drm_dp_hpd_bridge_add(struct auxiliary_device *adev) +static inline int devm_drm_dp_hpd_bridge_add(struct device *dev, struct auxiliary_device *adev) { return 0; }
If CONFIG_DRM_AUX_HPD_BRIDGE is not enabled, the aux-bridge.h header provides a stub for the bridge's functions. Correct the arguments list of one of those stubs to match the argument list of the non-stubbed function. Fixes: e5ca263508f7 ("drm/bridge: aux-hpd: separate allocation and registration") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202405110428.TMCfb1Ut-lkp@intel.com/ Cc: Johan Hovold <johan+linaro@kernel.org> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- include/drm/bridge/aux-bridge.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 713a75079f37b92835db48b27699e540657e3c5a change-id: 20240511-fix-aux-hpd-stubs-117c071fff77 Best regards,