container_of_const is more flexible than container_of when it comes to mixing pointers constness. Switch to it.
Signed-off-by: Maxime Ripard <[email protected]> --- include/drm/drm_atomic.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 1d05d5d7162e..def18b60a106 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -1379,15 +1379,12 @@ struct drm_bridge_state { * @output_bus_cfg: output bus configuration */ struct drm_bus_cfg output_bus_cfg; }; -static inline struct drm_bridge_state * -drm_priv_to_bridge_state(struct drm_private_state *priv) -{ - return container_of(priv, struct drm_bridge_state, base); -} +#define drm_priv_to_bridge_state(priv) \ + container_of_const(priv, struct drm_bridge_state, base) struct drm_bridge_state * drm_atomic_get_bridge_state(struct drm_atomic_commit *state, struct drm_bridge *bridge); struct drm_bridge_state * -- 2.54.0
