Ping? On Mon, Oct 26, 2020 at 1:50 PM Alex Deucher <alexdeucher@xxxxxxxxx> wrote: > > Fixes this warning: > drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_ddc.c: In function ‘defer_delay_converter_wa’: > drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_ddc.c:285:2: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation] > 285 | if (link->dpcd_caps.branch_dev_id == DP_BRANCH_DEVICE_ID_0080E1 && > | ^~ > drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_ddc.c:291:3: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’ > 291 | if (link->dpcd_caps.branch_dev_id == DP_BRANCH_DEVICE_ID_006037 && > | ^~ > > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c > index ef0f50db4907..54beda4d4e85 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c > @@ -283,15 +283,15 @@ static uint32_t defer_delay_converter_wa( > struct dc_link *link = ddc->link; > > if (link->dpcd_caps.branch_dev_id == DP_BRANCH_DEVICE_ID_0080E1 && > - !memcmp(link->dpcd_caps.branch_dev_name, > - DP_DVI_CONVERTER_ID_4, > - sizeof(link->dpcd_caps.branch_dev_name))) > + !memcmp(link->dpcd_caps.branch_dev_name, > + DP_DVI_CONVERTER_ID_4, > + sizeof(link->dpcd_caps.branch_dev_name))) > return defer_delay > I2C_OVER_AUX_DEFER_WA_DELAY ? > defer_delay : I2C_OVER_AUX_DEFER_WA_DELAY; > - if (link->dpcd_caps.branch_dev_id == DP_BRANCH_DEVICE_ID_006037 && > - !memcmp(link->dpcd_caps.branch_dev_name, > - DP_DVI_CONVERTER_ID_5, > - sizeof(link->dpcd_caps.branch_dev_name))) > + if (link->dpcd_caps.branch_dev_id == DP_BRANCH_DEVICE_ID_006037 && > + !memcmp(link->dpcd_caps.branch_dev_name, > + DP_DVI_CONVERTER_ID_5, > + sizeof(link->dpcd_caps.branch_dev_name))) > return defer_delay > I2C_OVER_AUX_DEFER_WA_DELAY_1MS ? > I2C_OVER_AUX_DEFER_WA_DELAY_1MS : defer_delay; > > -- > 2.25.4 > _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
