The checks weren't useful here really.
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>
};
-bool dce110_stream_encoder_construct(
+void dce110_stream_encoder_construct(
struct dce110_stream_encoder *enc110,
struct dc_context *ctx,
struct dc_bios *bp,
const struct dce_stream_encoder_shift *se_shift,
const struct dce_stream_encoder_mask *se_mask)
{
- if (!enc110)
- return false;
- if (!bp)
- return false;
-
enc110->base.funcs = &dce110_str_enc_funcs;
enc110->base.ctx = ctx;
enc110->base.id = eng_id;
enc110->regs = regs;
enc110->se_shift = se_shift;
enc110->se_mask = se_mask;
-
- return true;
}
const struct dce_stream_encoder_mask *se_mask;
};
-bool dce110_stream_encoder_construct(
+void dce110_stream_encoder_construct(
struct dce110_stream_encoder *enc110,
struct dc_context *ctx,
struct dc_bios *bp,
if (!enc110)
return NULL;
- if (dce110_stream_encoder_construct(
- enc110, ctx, ctx->dc_bios, eng_id,
- &stream_enc_regs[eng_id], &se_shift, &se_mask))
- return &enc110->base;
-
- BREAK_TO_DEBUGGER();
- kfree(enc110);
- return NULL;
+ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
+ &stream_enc_regs[eng_id], &se_shift, &se_mask);
+ return &enc110->base;
}
#define SRII(reg_name, block, id)\
if (!enc110)
return NULL;
- if (dce110_stream_encoder_construct(
- enc110, ctx, ctx->dc_bios, eng_id,
- &stream_enc_regs[eng_id], &se_shift, &se_mask))
- return &enc110->base;
-
- BREAK_TO_DEBUGGER();
- kfree(enc110);
- return NULL;
+ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
+ &stream_enc_regs[eng_id],
+ &se_shift, &se_mask);
+ return &enc110->base;
}
#define SRII(reg_name, block, id)\
if (!enc110)
return NULL;
-
- if (dce110_stream_encoder_construct(
- enc110, ctx, ctx->dc_bios, eng_id,
- &stream_enc_regs[eng_id], &se_shift, &se_mask))
- return &enc110->base;
-
- BREAK_TO_DEBUGGER();
- kfree(enc110);
- return NULL;
+
+ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
+ &stream_enc_regs[eng_id],
+ &se_shift, &se_mask);
+ return &enc110->base;
}
#define SRII(reg_name, block, id)\
if (!enc110)
return NULL;
- if (dce110_stream_encoder_construct(
- enc110, ctx, ctx->dc_bios, eng_id,
- &stream_enc_regs[eng_id], &se_shift, &se_mask))
- return &enc110->base;
-
- BREAK_TO_DEBUGGER();
- kfree(enc110);
- return NULL;
+ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
+ &stream_enc_regs[eng_id],
+ &se_shift, &se_mask);
+ return &enc110->base;
}
#define SRII(reg_name, block, id)\
if (!enc110)
return NULL;
- if (dce110_stream_encoder_construct(
- enc110, ctx, ctx->dc_bios, eng_id,
- &stream_enc_regs[eng_id], &se_shift, &se_mask))
- return &enc110->base;
-
- BREAK_TO_DEBUGGER();
- kfree(enc110);
- return NULL;
+ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
+ &stream_enc_regs[eng_id],
+ &se_shift, &se_mask);
+ return &enc110->base;
}
#define SRII(reg_name, block, id)\
if (!enc110)
return NULL;
- if (dce110_stream_encoder_construct(
- enc110, ctx, ctx->dc_bios, eng_id,
- &stream_enc_regs[eng_id], &se_shift, &se_mask))
- return &enc110->base;
-
- BREAK_TO_DEBUGGER();
- kfree(enc110);
- return NULL;
+ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
+ &stream_enc_regs[eng_id],
+ &se_shift, &se_mask);
+ return &enc110->base;
}
static const struct dce_hwseq_registers hwseq_reg = {