Quite a few instances of local variables needlessly initialized -
remove it.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@igalia.com>
---
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 62 ++++++++++++++----------------
1 file changed, 28 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index 96590c1da553..4503220c09aa 100644
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -444,7 +444,7 @@ static ssize_t amdgpu_get_pp_cur_state(struct device *dev,
struct amdgpu_device *adev = drm_to_adev(ddev);
struct pp_states_info data = {0};
enum amd_pm_state_type pm = 0;
- int i = 0, ret = 0;
+ int i, ret;
ret = amdgpu_pm_get_access_if_active(adev);
if (ret)
@@ -490,7 +490,7 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
{
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev);
- enum amd_pm_state_type state = 0;
+ enum amd_pm_state_type state;
struct pp_states_info data;
unsigned long idx;
int ret;
@@ -583,7 +583,7 @@ static ssize_t amdgpu_set_pp_table(struct device *dev,
{
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev);
- int ret = 0;
+ int ret;
ret = amdgpu_pm_get_access(adev);
if (ret < 0)
@@ -992,7 +992,7 @@ static ssize_t amdgpu_get_pp_dpm_clock(struct device *dev,
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev);
int size = 0;
- int ret = 0;
+ int ret;
ret = amdgpu_pm_get_access_if_active(adev);
if (ret)
@@ -1229,7 +1229,7 @@ static ssize_t amdgpu_get_pp_sclk_od(struct device *dev,
{
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev);
- uint32_t value = 0;
+ uint32_t value;
int ret;
ret = amdgpu_pm_get_access_if_active(adev);
@@ -1275,7 +1275,7 @@ static ssize_t amdgpu_get_pp_mclk_od(struct device *dev,
{
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev);
- uint32_t value = 0;
+ uint32_t value;
int ret;
ret = amdgpu_pm_get_access_if_active(adev);
@@ -1376,7 +1376,7 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct
device *dev,
char *tmp_str;
uint32_t i = 0;
char tmp[2];
- long int profile_mode = 0;
+ long int profile_mode;
const char delimiter[3] = {' ', '\n', '\0'};
tmp[0] = *(buf);
@@ -1609,7 +1609,7 @@ static ssize_t
amdgpu_set_thermal_throttling_logging(struct device *dev,
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev);
long throttling_logging_interval;
- int ret = 0;
+ int ret;
ret = kstrtol(buf, 0, &throttling_logging_interval);
if (ret)
@@ -1720,7 +1720,7 @@ static ssize_t amdgpu_get_pm_metrics(struct device *dev,
{
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev);
- ssize_t size = 0;
+ ssize_t size;
int ret;
ret = amdgpu_pm_get_access_if_active(adev);
@@ -1753,7 +1753,7 @@ static ssize_t amdgpu_get_gpu_metrics(struct device *dev,
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev);
void *gpu_metrics;
- ssize_t size = 0;
+ ssize_t size;
int ret;
ret = amdgpu_pm_get_access_if_active(adev);
@@ -1781,7 +1781,7 @@ static int amdgpu_show_powershift_percent(struct device
*dev,
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev);
uint32_t ss_power;
- int r = 0, i;
+ int r, i;
r = amdgpu_hwmon_get_sensor_generic(adev, sensor, (void *)&ss_power);
if (r == -EOPNOTSUPP) {
@@ -1850,11 +1850,7 @@ static ssize_t amdgpu_get_smartshift_bias(struct device
*dev,
struct device_attribute *attr,
char *buf)
{
- int r = 0;
-
- r = sysfs_emit(buf, "%d\n", amdgpu_smartshift_bias);
-
- return r;
+ return sysfs_emit(buf, "%d\n", amdgpu_smartshift_bias);
}
static ssize_t amdgpu_set_smartshift_bias(struct device *dev,
@@ -1863,8 +1859,7 @@ static ssize_t amdgpu_set_smartshift_bias(struct device
*dev,
{
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev);
- int r = 0;
- int bias = 0;
+ int r, bias;
r = kstrtoint(buf, 10, &bias);
if (r)
@@ -2529,11 +2524,11 @@ static int amdgpu_device_attr_create(struct
amdgpu_device *adev,
struct amdgpu_device_attr *attr,
uint32_t mask, struct list_head *attr_list)
{
- int ret = 0;
enum amdgpu_device_attr_states attr_states = ATTR_STATE_SUPPORTED;
struct amdgpu_device_attr_entry *attr_entry;
struct device_attribute *dev_attr;
const char *name;
+ int ret;
int (*attr_update)(struct amdgpu_device *adev, struct
amdgpu_device_attr *attr,
uint32_t mask, enum amdgpu_device_attr_states
*states) = default_attr_update;
@@ -2590,21 +2585,19 @@ static int amdgpu_device_attr_create_groups(struct
amdgpu_device *adev,
uint32_t mask,
struct list_head *attr_list)
{
- int ret = 0;
- uint32_t i = 0;
+ uint32_t i;
+ int ret;
for (i = 0; i < counts; i++) {
- ret = amdgpu_device_attr_create(adev, &attrs[i], mask,
attr_list);
- if (ret)
- goto failed;
+ ret = amdgpu_device_attr_create(adev, &attrs[i], mask,
+ attr_list);
+ if (ret) {
+ amdgpu_device_attr_remove_groups(adev, attr_list);
+ return ret;
+ }
}
return 0;
-
-failed:
- amdgpu_device_attr_remove_groups(adev, attr_list);
-
- return ret;
}
static void amdgpu_device_attr_remove_groups(struct amdgpu_device *adev,
@@ -2726,7 +2719,7 @@ static ssize_t amdgpu_hwmon_show_temp_emergency(struct
device *dev,
{
struct amdgpu_device *adev = dev_get_drvdata(dev);
int channel = to_sensor_dev_attr(attr)->index;
- int temp = 0;
+ int temp;
if (channel >= PP_TEMP_MAX)
return -EINVAL;
@@ -2741,6 +2734,8 @@ static ssize_t amdgpu_hwmon_show_temp_emergency(struct
device *dev,
case PP_TEMP_MEM:
temp = adev->pm.dpm.thermal.max_mem_emergency_temp;
break;
+ default:
+ temp = 0;
}
return sysfs_emit(buf, "%d\n", temp);
@@ -3718,8 +3713,7 @@ static int amdgpu_retrieve_od_settings(struct
amdgpu_device *adev,
enum pp_clock_type od_type,
char *buf)
{
- int size = 0;
- int ret;
+ int size, ret;
ret = amdgpu_pm_get_access_if_active(adev);
if (ret)
@@ -4530,7 +4524,7 @@ static int amdgpu_od_set_init(struct amdgpu_device *adev)
int amdgpu_pm_sysfs_init(struct amdgpu_device *adev)
{
enum amdgpu_sriov_vf_mode mode;
- uint32_t mask = 0;
+ uint32_t mask;
int ret;
if (adev->pm.sysfs_initialized)
@@ -4847,7 +4841,7 @@ static ssize_t amdgpu_pm_prv_buffer_read(struct file *f,
char __user *buf,
struct amdgpu_device *adev = file_inode(f)->i_private;
size_t smu_prv_buf_size;
void *smu_prv_buf;
- int ret = 0;
+ int ret;
ret = amdgpu_pm_dev_state_check(adev, true);
if (ret)
--
2.48.0
