The size is stored and cleared in init/fini but never used to for anything else like copy. Drop the size and use pointer for init/fini checks.
Signed-off-by: Lijo Lazar <[email protected]> --- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 - drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 -- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 6 ++---- drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 6 ++---- drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c | 6 ++---- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h index 2586f9fa6589..ab43a5cd0dcd 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h @@ -487,7 +487,6 @@ struct smu_power_gate { struct smu_power_context { void *power_context; - uint32_t power_context_size; struct smu_power_gate power_gate; }; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c index f0b2e7da67b1..09e20d5ee044 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c @@ -345,7 +345,6 @@ int smu_v11_0_init_power(struct smu_context *smu) smu_power->power_context = kzalloc(size, GFP_KERNEL); if (!smu_power->power_context) return -ENOMEM; - smu_power->power_context_size = size; return 0; } @@ -356,7 +355,6 @@ int smu_v11_0_fini_power(struct smu_context *smu) kfree(smu_power->power_context); smu_power->power_context = NULL; - smu_power->power_context_size = 0; return 0; } diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c index c4b2fe60da62..b250c5e41e45 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c @@ -427,13 +427,12 @@ int smu_v13_0_init_power(struct smu_context *smu) { struct smu_power_context *smu_power = &smu->smu_power; - if (smu_power->power_context || smu_power->power_context_size != 0) + if (smu_power->power_context) return -EINVAL; smu_power->power_context = kzalloc_obj(struct smu_13_0_power_context); if (!smu_power->power_context) return -ENOMEM; - smu_power->power_context_size = sizeof(struct smu_13_0_power_context); return 0; } @@ -442,12 +441,11 @@ int smu_v13_0_fini_power(struct smu_context *smu) { struct smu_power_context *smu_power = &smu->smu_power; - if (!smu_power->power_context || smu_power->power_context_size == 0) + if (!smu_power->power_context) return -EINVAL; kfree(smu_power->power_context); smu_power->power_context = NULL; - smu_power->power_context_size = 0; return 0; } diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c index f2e6105b0d79..5e890b56fd37 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c @@ -393,13 +393,12 @@ int smu_v14_0_init_power(struct smu_context *smu) { struct smu_power_context *smu_power = &smu->smu_power; - if (smu_power->power_context || smu_power->power_context_size != 0) + if (smu_power->power_context) return -EINVAL; smu_power->power_context = kzalloc_obj(struct smu_14_0_power_context); if (!smu_power->power_context) return -ENOMEM; - smu_power->power_context_size = sizeof(struct smu_14_0_power_context); return 0; } @@ -408,12 +407,11 @@ int smu_v14_0_fini_power(struct smu_context *smu) { struct smu_power_context *smu_power = &smu->smu_power; - if (!smu_power->power_context || smu_power->power_context_size == 0) + if (!smu_power->power_context) return -EINVAL; kfree(smu_power->power_context); smu_power->power_context = NULL; - smu_power->power_context_size = 0; return 0; } diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c index dfc1022112d5..4be864e4f0e6 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c @@ -335,13 +335,12 @@ int smu_v15_0_init_power(struct smu_context *smu) { struct smu_power_context *smu_power = &smu->smu_power; - if (smu_power->power_context || smu_power->power_context_size != 0) + if (smu_power->power_context) return -EINVAL; smu_power->power_context = kzalloc_obj(struct smu_15_0_power_context); if (!smu_power->power_context) return -ENOMEM; - smu_power->power_context_size = sizeof(struct smu_15_0_power_context); return 0; } @@ -350,12 +349,11 @@ int smu_v15_0_fini_power(struct smu_context *smu) { struct smu_power_context *smu_power = &smu->smu_power; - if (!smu_power->power_context || smu_power->power_context_size == 0) + if (!smu_power->power_context) return -EINVAL; kfree(smu_power->power_context); smu_power->power_context = NULL; - smu_power->power_context_size = 0; return 0; } -- 2.49.0
