Message ID | e5f538ab-ebc8-400b-8104-4642b8089b4f@moroto.mountain (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/amd/display: re-indent dc_power_down_on_boot() | expand |
Am 24.04.24 um 13:41 schrieb Dan Carpenter: > These lines are indented too far. Clean the whitespace. > > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c > index 8eefba757da4..f64d7229eb6c 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c > @@ -5043,11 +5043,10 @@ void dc_interrupt_ack(struct dc *dc, enum dc_irq_source src) > void dc_power_down_on_boot(struct dc *dc) > { > if (dc->ctx->dce_environment != DCE_ENV_VIRTUAL_HW && > - dc->hwss.power_down_on_boot) { > - > - if (dc->caps.ips_support) > - dc_exit_ips_for_hw_access(dc); > + dc->hwss.power_down_on_boot) { > > + if (dc->caps.ips_support) > + dc_exit_ips_for_hw_access(dc); Well while at it can't the two ifs be merged here? (I don't know this code to well, but it looks like it). Regards, Christian. > dc->hwss.power_down_on_boot(dc); > } > }
On Wed, Apr 24, 2024 at 03:11:08PM +0200, Christian König wrote: > Am 24.04.24 um 13:41 schrieb Dan Carpenter: > > These lines are indented too far. Clean the whitespace. > > > > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > > --- > > drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +++---- > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c > > index 8eefba757da4..f64d7229eb6c 100644 > > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c > > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c > > @@ -5043,11 +5043,10 @@ void dc_interrupt_ack(struct dc *dc, enum dc_irq_source src) > > void dc_power_down_on_boot(struct dc *dc) > > { > > if (dc->ctx->dce_environment != DCE_ENV_VIRTUAL_HW && > > - dc->hwss.power_down_on_boot) { > > - > > - if (dc->caps.ips_support) > > - dc_exit_ips_for_hw_access(dc); > > + dc->hwss.power_down_on_boot) { > > + if (dc->caps.ips_support) > > + dc_exit_ips_for_hw_access(dc); > > Well while at it can't the two ifs be merged here? > > (I don't know this code to well, but it looks like it). > I'm sorry, I don't see what you're saying. I probably should have deleted the other blank line as well, though. It introduces a checkpatch.pl --strict warning. regards, dan carpenter
Am 24.04.24 um 15:20 schrieb Dan Carpenter: > On Wed, Apr 24, 2024 at 03:11:08PM +0200, Christian König wrote: >> Am 24.04.24 um 13:41 schrieb Dan Carpenter: >>> These lines are indented too far. Clean the whitespace. >>> >>> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> >>> --- >>> drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +++---- >>> 1 file changed, 3 insertions(+), 4 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c >>> index 8eefba757da4..f64d7229eb6c 100644 >>> --- a/drivers/gpu/drm/amd/display/dc/core/dc.c >>> +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c >>> @@ -5043,11 +5043,10 @@ void dc_interrupt_ack(struct dc *dc, enum dc_irq_source src) >>> void dc_power_down_on_boot(struct dc *dc) >>> { >>> if (dc->ctx->dce_environment != DCE_ENV_VIRTUAL_HW && >>> - dc->hwss.power_down_on_boot) { >>> - >>> - if (dc->caps.ips_support) >>> - dc_exit_ips_for_hw_access(dc); >>> + dc->hwss.power_down_on_boot) { >>> + if (dc->caps.ips_support) >>> + dc_exit_ips_for_hw_access(dc); >> Well while at it can't the two ifs be merged here? >> >> (I don't know this code to well, but it looks like it). >> > I'm sorry, I don't see what you're saying. The indentation was so messed up that I though the call to power_down_on_boot() was after both ifs, but it is still inside the first. So your patch is actually right, sorry for the noise. Regards, Christian. > > I probably should have deleted the other blank line as well, though. > It introduces a checkpatch.pl --strict warning. > > regards, > dan carpenter >
On Wed, Apr 24, 2024 at 03:33:11PM +0200, Christian König wrote: > Am 24.04.24 um 15:20 schrieb Dan Carpenter: > > On Wed, Apr 24, 2024 at 03:11:08PM +0200, Christian König wrote: > > > Am 24.04.24 um 13:41 schrieb Dan Carpenter: > > > > These lines are indented too far. Clean the whitespace. > > > > > > > > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > > > > --- > > > > drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +++---- > > > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c > > > > index 8eefba757da4..f64d7229eb6c 100644 > > > > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c > > > > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c > > > > @@ -5043,11 +5043,10 @@ void dc_interrupt_ack(struct dc *dc, enum dc_irq_source src) > > > > void dc_power_down_on_boot(struct dc *dc) > > > > { > > > > if (dc->ctx->dce_environment != DCE_ENV_VIRTUAL_HW && > > > > - dc->hwss.power_down_on_boot) { > > > > - > > > > - if (dc->caps.ips_support) > > > > - dc_exit_ips_for_hw_access(dc); > > > > + dc->hwss.power_down_on_boot) { > > > > + if (dc->caps.ips_support) > > > > + dc_exit_ips_for_hw_access(dc); > > > Well while at it can't the two ifs be merged here? > > > > > > (I don't know this code to well, but it looks like it). > > > > > I'm sorry, I don't see what you're saying. > > The indentation was so messed up that I though the call to > power_down_on_boot() was after both ifs, but it is still inside the first. > > So your patch is actually right, sorry for the noise. Okay, but let me send a v2 anyway to delete the extra blank line. regards, dan carpenter
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 8eefba757da4..f64d7229eb6c 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -5043,11 +5043,10 @@ void dc_interrupt_ack(struct dc *dc, enum dc_irq_source src) void dc_power_down_on_boot(struct dc *dc) { if (dc->ctx->dce_environment != DCE_ENV_VIRTUAL_HW && - dc->hwss.power_down_on_boot) { - - if (dc->caps.ips_support) - dc_exit_ips_for_hw_access(dc); + dc->hwss.power_down_on_boot) { + if (dc->caps.ips_support) + dc_exit_ips_for_hw_access(dc); dc->hwss.power_down_on_boot(dc); } }
These lines are indented too far. Clean the whitespace. Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)