Commit 6be663b5 authored by Dave Airlie's avatar Dave Airlie Committed by Alex Deucher

amdgpu/dc: fix construct return values on irq service.

This just removes more unused return/errors paths.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent db6c3bdc
...@@ -406,17 +406,14 @@ static const struct irq_service_funcs irq_service_funcs_dce110 = { ...@@ -406,17 +406,14 @@ static const struct irq_service_funcs irq_service_funcs_dce110 = {
.to_dal_irq_source = to_dal_irq_source_dce110 .to_dal_irq_source = to_dal_irq_source_dce110
}; };
static bool construct( static void construct(
struct irq_service *irq_service, struct irq_service *irq_service,
struct irq_service_init_data *init_data) struct irq_service_init_data *init_data)
{ {
if (!dal_irq_service_construct(irq_service, init_data)) dal_irq_service_construct(irq_service, init_data);
return false;
irq_service->info = irq_source_info_dce110; irq_service->info = irq_source_info_dce110;
irq_service->funcs = &irq_service_funcs_dce110; irq_service->funcs = &irq_service_funcs_dce110;
return true;
} }
struct irq_service *dal_irq_service_dce110_create( struct irq_service *dal_irq_service_dce110_create(
...@@ -428,9 +425,6 @@ struct irq_service *dal_irq_service_dce110_create( ...@@ -428,9 +425,6 @@ struct irq_service *dal_irq_service_dce110_create(
if (!irq_service) if (!irq_service)
return NULL; return NULL;
if (construct(irq_service, init_data)) construct(irq_service, init_data);
return irq_service; return irq_service;
kfree(irq_service);
return NULL;
} }
...@@ -265,17 +265,14 @@ static const struct irq_service_funcs irq_service_funcs_dce120 = { ...@@ -265,17 +265,14 @@ static const struct irq_service_funcs irq_service_funcs_dce120 = {
.to_dal_irq_source = to_dal_irq_source_dce110 .to_dal_irq_source = to_dal_irq_source_dce110
}; };
static bool construct( static void construct(
struct irq_service *irq_service, struct irq_service *irq_service,
struct irq_service_init_data *init_data) struct irq_service_init_data *init_data)
{ {
if (!dal_irq_service_construct(irq_service, init_data)) dal_irq_service_construct(irq_service, init_data);
return false;
irq_service->info = irq_source_info_dce120; irq_service->info = irq_source_info_dce120;
irq_service->funcs = &irq_service_funcs_dce120; irq_service->funcs = &irq_service_funcs_dce120;
return true;
} }
struct irq_service *dal_irq_service_dce120_create( struct irq_service *dal_irq_service_dce120_create(
...@@ -287,9 +284,6 @@ struct irq_service *dal_irq_service_dce120_create( ...@@ -287,9 +284,6 @@ struct irq_service *dal_irq_service_dce120_create(
if (!irq_service) if (!irq_service)
return NULL; return NULL;
if (construct(irq_service, init_data)) construct(irq_service, init_data);
return irq_service; return irq_service;
kfree(irq_service);
return NULL;
} }
...@@ -277,17 +277,14 @@ static const struct irq_service_funcs irq_service_funcs_dce80 = { ...@@ -277,17 +277,14 @@ static const struct irq_service_funcs irq_service_funcs_dce80 = {
.to_dal_irq_source = to_dal_irq_source_dce110 .to_dal_irq_source = to_dal_irq_source_dce110
}; };
static bool construct( static void construct(
struct irq_service *irq_service, struct irq_service *irq_service,
struct irq_service_init_data *init_data) struct irq_service_init_data *init_data)
{ {
if (!dal_irq_service_construct(irq_service, init_data)) dal_irq_service_construct(irq_service, init_data);
return false;
irq_service->info = irq_source_info_dce80; irq_service->info = irq_source_info_dce80;
irq_service->funcs = &irq_service_funcs_dce80; irq_service->funcs = &irq_service_funcs_dce80;
return true;
} }
struct irq_service *dal_irq_service_dce80_create( struct irq_service *dal_irq_service_dce80_create(
...@@ -299,11 +296,8 @@ struct irq_service *dal_irq_service_dce80_create( ...@@ -299,11 +296,8 @@ struct irq_service *dal_irq_service_dce80_create(
if (!irq_service) if (!irq_service)
return NULL; return NULL;
if (construct(irq_service, init_data)) construct(irq_service, init_data);
return irq_service; return irq_service;
kfree(irq_service);
return NULL;
} }
...@@ -332,17 +332,14 @@ static const struct irq_service_funcs irq_service_funcs_dcn10 = { ...@@ -332,17 +332,14 @@ static const struct irq_service_funcs irq_service_funcs_dcn10 = {
.to_dal_irq_source = to_dal_irq_source_dcn10 .to_dal_irq_source = to_dal_irq_source_dcn10
}; };
static bool construct( static void construct(
struct irq_service *irq_service, struct irq_service *irq_service,
struct irq_service_init_data *init_data) struct irq_service_init_data *init_data)
{ {
if (!dal_irq_service_construct(irq_service, init_data)) dal_irq_service_construct(irq_service, init_data);
return false;
irq_service->info = irq_source_info_dcn10; irq_service->info = irq_source_info_dcn10;
irq_service->funcs = &irq_service_funcs_dcn10; irq_service->funcs = &irq_service_funcs_dcn10;
return true;
} }
struct irq_service *dal_irq_service_dcn10_create( struct irq_service *dal_irq_service_dcn10_create(
...@@ -354,9 +351,6 @@ struct irq_service *dal_irq_service_dcn10_create( ...@@ -354,9 +351,6 @@ struct irq_service *dal_irq_service_dcn10_create(
if (!irq_service) if (!irq_service)
return NULL; return NULL;
if (construct(irq_service, init_data)) construct(irq_service, init_data);
return irq_service; return irq_service;
kfree(irq_service);
return NULL;
} }
...@@ -48,15 +48,16 @@ ...@@ -48,15 +48,16 @@
#define CTX \ #define CTX \
irq_service->ctx irq_service->ctx
bool dal_irq_service_construct( void dal_irq_service_construct(
struct irq_service *irq_service, struct irq_service *irq_service,
struct irq_service_init_data *init_data) struct irq_service_init_data *init_data)
{ {
if (!init_data || !init_data->ctx) if (!init_data || !init_data->ctx) {
return false; BREAK_TO_DEBUGGER();
return;
}
irq_service->ctx = init_data->ctx; irq_service->ctx = init_data->ctx;
return true;
} }
void dal_irq_service_destroy(struct irq_service **irq_service) void dal_irq_service_destroy(struct irq_service **irq_service)
......
...@@ -69,7 +69,7 @@ struct irq_service { ...@@ -69,7 +69,7 @@ struct irq_service {
const struct irq_service_funcs *funcs; const struct irq_service_funcs *funcs;
}; };
bool dal_irq_service_construct( void dal_irq_service_construct(
struct irq_service *irq_service, struct irq_service *irq_service,
struct irq_service_init_data *init_data); struct irq_service_init_data *init_data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment