amdgpu/dc: make opp construct void.

This doesn't return anything except true.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c
index c0736aeabd850971120f93687e5b7055aae5e5f5..3931412ab6d32e139a9653a12fe5c2d6de8c9337 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c
@@ -540,7 +540,7 @@ static const struct opp_funcs funcs = {
        .opp_program_bit_depth_reduction = dce110_opp_program_bit_depth_reduction
 };
 
-bool dce110_opp_construct(struct dce110_opp *opp110,
+void dce110_opp_construct(struct dce110_opp *opp110,
        struct dc_context *ctx,
        uint32_t inst,
        const struct dce_opp_registers *regs,
@@ -556,8 +556,6 @@ bool dce110_opp_construct(struct dce110_opp *opp110,
        opp110->regs = regs;
        opp110->opp_shift = opp_shift;
        opp110->opp_mask = opp_mask;
-
-       return true;
 }
 
 void dce110_opp_destroy(struct output_pixel_processor **opp)

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h
index 0874c22b8b025d26af0c2cf345a5a91bad45c9db..2ab0147cbd9d4fc28442a5de1240bf9fa07369f8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h
@@ -272,7 +272,7 @@ struct dce110_opp {
        const struct dce_opp_mask *opp_mask;
 };
 
-bool dce110_opp_construct(struct dce110_opp *opp110,
+void dce110_opp_construct(struct dce110_opp *opp110,
        struct dc_context *ctx,
        uint32_t inst,
        const struct dce_opp_registers *regs,

diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
index 0084645837ec6b1fdf2800b498cafa9bae4d93ca..729d82eb65008c8af883f668fa58b55886067a7f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
@@ -547,13 +547,9 @@ struct output_pixel_processor *dce100_opp_create(
        if (!opp)
                return NULL;
 
-       if (dce110_opp_construct(opp,
-                       ctx, inst, &opp_regs[inst], &opp_shift, &opp_mask))
-               return &opp->base;
-
-       BREAK_TO_DEBUGGER();
-       kfree(opp);
-       return NULL;
+       dce110_opp_construct(opp,
+                            ctx, inst, &opp_regs[inst], &opp_shift, &opp_mask);
+       return &opp->base;
 }
 
 struct clock_source *dce100_clock_source_create(

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
index 2c24f2b882fe69a913eaa9adc59cd14c36b750b8..8e3f365177b82ba37b92d5a39cdd577cc1dfe745 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -586,13 +586,9 @@ static struct output_pixel_processor *dce110_opp_create(
        if (!opp)
                return NULL;
 
-       if (dce110_opp_construct(opp,
-                               ctx, inst, &opp_regs[inst], &opp_shift, &opp_mask))
-               return &opp->base;
-
-       BREAK_TO_DEBUGGER();
-       kfree(opp);
-       return NULL;
+       dce110_opp_construct(opp,
+                            ctx, inst, &opp_regs[inst], &opp_shift, &opp_mask);
+       return &opp->base;
 }
 
 struct clock_source *dce110_clock_source_create(

diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index 7aac8fdb3030739f6bf68afe1c220e8946d95dd4..3cb18cecb8005410ab03842cc97e9c94fe0e7d39 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -586,13 +586,9 @@ struct output_pixel_processor *dce112_opp_create(
        if (!opp)
                return NULL;
 
-       if (dce110_opp_construct(opp,
-                       ctx, inst, &opp_regs[inst], &opp_shift, &opp_mask))
-               return &opp->base;
-
-       BREAK_TO_DEBUGGER();
-       kfree(opp);
-       return NULL;
+       dce110_opp_construct(opp,
+                            ctx, inst, &opp_regs[inst], &opp_shift, &opp_mask);
+       return &opp->base;
 }
 
 struct clock_source *dce112_clock_source_create(

diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
index 7de99c454f4beca52f404a36ff6a49b27d5606ff..ea234376c0e2322827b997bcd766db483a1daef8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
@@ -356,13 +356,9 @@ struct output_pixel_processor *dce120_opp_create(
        if (!opp)
                return NULL;
 
-       if (dce110_opp_construct(opp,
-                       ctx, inst, &opp_regs[inst], &opp_shift, &opp_mask))
-               return &opp->base;
-
-       BREAK_TO_DEBUGGER();
-       kfree(opp);
-       return NULL;
+       dce110_opp_construct(opp,
+                            ctx, inst, &opp_regs[inst], &opp_shift, &opp_mask);
+       return &opp->base;
 }
 
 static const struct bios_registers bios_regs = {

diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
index 3603ae93cd7200b343ea29427dad2659647bba83..71f265b6b6705cbe5f16be2c2f6e00771f45aa1c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
@@ -422,13 +422,9 @@ static struct output_pixel_processor *dce80_opp_create(
        if (!opp)
                return NULL;
 
-       if (dce110_opp_construct(opp,
-                       ctx, inst, &opp_regs[inst], &opp_shift, &opp_mask))
-               return &opp->base;
-
-       BREAK_TO_DEBUGGER();
-       kfree(opp);
-       return NULL;
+       dce110_opp_construct(opp,
+                            ctx, inst, &opp_regs[inst], &opp_shift, &opp_mask);
+       return &opp->base;
 }
 
 static struct stream_encoder *dce80_stream_encoder_create(