From: Lyude Paul Date: Wed, 6 Feb 2019 18:31:01 +0000 (-0500) Subject: drm/dp_mst: Remove rebase-detritus in VCPI helper kernel-docs X-Git-Tag: microblaze-v5.4-rc1~229^2~30^2~430 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=123cbb6c70e1a6270a19aa48765394b549a12cdf;p=linux-2.6-microblaze.git drm/dp_mst: Remove rebase-detritus in VCPI helper kernel-docs Looks like when making the final revision of: commit 022debad063e ("drm/atomic: Add drm_atomic_state->duplicated") I forgot to remove some of the comments that I had added to drm_dp_atomic_find_vcpi_slots() and drm_dp_atomic_release_vcpi_slots() that were no longer valid due to us having removed the state->duplicated checks from each function. This also introduced an error while building the docs with sphinx: ./drivers/gpu/drm/drm_dp_mst_topology.c:3100: WARNING: Inline literal start-string without end-string. So, fix that by just removing the kerneldoc comments. Signed-off-by: Lyude Paul Fixes: 022debad063e ("drm/atomic: Add drm_atomic_state->duplicated") Reviewed-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20190202002023.29665-5-lyude@redhat.com --- diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 5a99135d39cd..dc7ac0c60547 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3097,10 +3097,6 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr, * @port as needed. It is not OK however, to call this function and * drm_dp_atomic_release_vcpi_slots() in the same atomic check phase. * - * When &drm_atomic_state.duplicated is set to %true%, this function will not - * perform any error checking and will instead simply return the previously - * recorded VCPI allocations. - * * See also: * drm_dp_atomic_release_vcpi_slots() * drm_dp_mst_atomic_check() @@ -3185,11 +3181,6 @@ EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots); * drm_dp_atomic_find_vcpi_slots() on the same @port in a single atomic check * phase. * - * When &drm_atomic_state.duplicated is set, this function will not - * modify the VCPI allocations in &drm_dp_mst_topology_state.vcpis, so that - * those VCPI allocations may be restored as-is from the duplicated state. In - * this scenario, this function will always return 0. - * * See also: * drm_dp_atomic_find_vcpi_slots() * drm_dp_mst_atomic_check()