drm/amd/powerplay: Remove unnecessary cast on void pointer
Subsystems (2)
PATCH v4 1/1 drm/amd/powerplay: Remove unnecessary cast on void pointer
Done with following coccinelle patch
@r@
expression x;
void* e;
type T;
identifier f;
@@
(
*((T *)e)
|
((T *)x)[...]
|
((T*)x)->f
|
- (T*)
e
)
---
Changes in v4:
-Removed git diff warning "No newline at end of file"
Changes in v3:
-Removed unnecessary lines
-Remove more useless casts
Changes in v2:
-Remove unnecessary parentheses
-Remove one more useless cast
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 6 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 4 +- .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 177 ++++++++++----------- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 22 +-- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 2 +- 9 files changed, 105 insertions(+), 120 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +3 -3
@@ -474,7 +474,7 @@ static int cz_tf_upload_pptable_to_smu(struct pp_hwmgr *hwmgr, void *input,PP_ASSERT_WITH_CODE ((0 == ret &&NULL != table), "Fail to get clock table from SMU!", return -EINVAL;); - clock_table = (struct SMU8_Fusion_ClkTable *)table; + clock_table = table;/* patch clock table */ PP_ASSERT_WITH_CODE((vddc_table->count <= CZ_MAX_HARDWARE_POWERLEVELS),
@@ -868,8 +868,8 @@ static int cz_tf_update_low_mem_pstate(struct pp_hwmgr *hwmgr, {bool disable_switch;bool enable_low_mem_state; -struct cz_hwmgr *hw_data = (struct cz_hwmgr *)(hwmgr->backend); -const struct phm_set_power_state_input *states = (struct phm_set_power_state_input *)input; +struct cz_hwmgr *hw_data = hwmgr->backend; +const struct phm_set_power_state_input *states = input;const struct cz_power_state *pnew_state =cast_const_PhwCzPowerState (states->pnew_state);if (hw_data->sys_info.nb_dpm_enable) {
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +4 -4
@@ -469,7 +469,7 @@ int phm_reset_single_dpm_table(void *table, {int i; -struct vi_dpm_table *dpm_table = (struct vi_dpm_table *)table; +struct vi_dpm_table *dpm_table = table; dpm_table->count = count > max ? max : count;
@@ -484,7 +484,7 @@ void phm_setup_pcie_table_entry( uint32_t index, uint32_t pcie_gen, uint32_t pcie_lanes) { - struct vi_dpm_table *dpm_table = (struct vi_dpm_table *)table; + struct vi_dpm_table *dpm_table = table; dpm_table->dpm_level[index].value = pcie_gen; dpm_table->dpm_level[index].param1 = pcie_lanes; dpm_table->dpm_level[index].enabled =1 ;
@@ -494,7 +494,7 @@ int32_t phm_get_dpm_level_enable_mask_value(void *table) {int32_t i;int32_t mask =0 ; -struct vi_dpm_table *dpm_table = (struct vi_dpm_table *)table; +struct vi_dpm_table *dpm_table = table;for (i = dpm_table->count; i >0 ; i--) { mask = mask <<1 ;
@@ -566,7 +566,7 @@ int phm_find_boot_level(void *table, {int result = -EINVAL ;uint32_t i; -struct vi_dpm_table *dpm_table = (struct vi_dpm_table *)table; +struct vi_dpm_table *dpm_table = table;for (i =0 ; i < dpm_table->count; i++) {if (value == dpm_table->dpm_level[i].value) {
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c +1 -1
@@ -579,7 +579,7 @@ static ATOM_GPIO_PIN_LUT *get_gpio_lookup_table(void *device)PP_ASSERT_WITH_CODE ((NULL != table_address), "Error retrieving BIOS Table Address!", return NULL;); -return (ATOM_GPIO_PIN_LUT *)table_address; +return table_address; }/**
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c +2 -2
@@ -66,7 +66,7 @@ static struct atom_voltage_objects_info_v4_1 *pp_atomfwctrl_get_voltage_info_tab"Error retrieving BIOS Table Address!" , return NULL); -return (struct atom_voltage_objects_info_v4_1 *)table_address; +return table_address; }/**
@@ -173,7 +173,7 @@ static struct atom_gpio_pin_lut_v2_1 *pp_atomfwctrl_get_gpio_lookup_table("Error retrieving BIOS Table Address!" , return NULL); -return (struct atom_gpio_pin_lut_v2_1 *)table_address; +return table_address; } static bool pp_atomfwctrl_lookup_gpio_pin(
drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c +1 -1
@@ -807,7 +807,7 @@ static const ATOM_PPLIB_POWERPLAYTABLE *get_powerplay_table( hwmgr->soft_pp_table_size = size; } -return (const ATOM_PPLIB_POWERPLAYTABLE *)table_addr; +return table_addr; } int pp_tables_get_response_times(struct pp_hwmgr *hwmgr,
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +84 -93
638 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c +1 -1
@@ -452,7 +452,7 @@ static int tf_smu7_thermal_start_smc_fan_control(struct pp_hwmgr *hwmgr,static int tf_smu7_thermal_set_temperature_range (struct pp_hwmgr *hwmgr,void *input,void *output,void *storage,int result) { -struct PP_TemperatureRange *range = (struct PP_TemperatureRange *)input; +struct PP_TemperatureRange *range = input;if (range ==NULL )return -EINVAL ;
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +8 -14
@@ -2994,9 +2994,8 @@ static int vega10_get_pp_table_entry_callback_func(struct pp_hwmgr *hwmgr,struct vega10_power_state *vega10_power_state =cast_phw_vega10_power_state (&(power_state->hardware));struct vega10_performance_level *performance_level; -ATOM_Vega10_State *state_entry = (ATOM_Vega10_State *)state; -ATOM_Vega10_POWERPLAYTABLE *powerplay_table = - (ATOM_Vega10_POWERPLAYTABLE *)pp_table; +ATOM_Vega10_State *state_entry = state; +ATOM_Vega10_POWERPLAYTABLE *powerplay_table = pp_table; ATOM_Vega10_SOCCLK_Dependency_Table *socclk_dep_table = (ATOM_Vega10_SOCCLK_Dependency_Table *) (((unsigned long)powerplay_table) +
@@ -3305,8 +3304,7 @@ static int vega10_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,static int vega10_find_dpm_states_clocks_in_dpm_table (struct pp_hwmgr *hwmgr,const void *input) { -const struct phm_set_power_state_input *states = - (const struct phm_set_power_state_input *)input; +const struct phm_set_power_state_input *states = input;const struct vega10_power_state *vega10_ps =cast_const_phw_vega10_power_state (states->pnew_state); struct vega10_hwmgr *data =
@@ -3396,12 +3394,10 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels( struct pp_hwmgr *hwmgr, const void *input) { int result = 0; -const struct phm_set_power_state_input *states = - (const struct phm_set_power_state_input *)input; +const struct phm_set_power_state_input *states = input;const struct vega10_power_state *vega10_ps =cast_const_phw_vega10_power_state (states->pnew_state); -struct vega10_hwmgr *data = - (struct vega10_hwmgr *)(hwmgr->backend); +struct vega10_hwmgr *data = hwmgr->backend;uint32_t sclk = vega10_ps->performance_levels [vega10_ps->performance_level_count -1 ].gfx_clock;uint32_t mclk = vega10_ps->performance_levels
@@ -3810,10 +3806,8 @@ static int vega10_upload_dpm_max_level(struct pp_hwmgr *hwmgr)static int vega10_generate_dpm_level_enable_mask (struct pp_hwmgr *hwmgr,const void *input) { -struct vega10_hwmgr *data = - (struct vega10_hwmgr *)(hwmgr->backend); -const struct phm_set_power_state_input *states = - (const struct phm_set_power_state_input *)input; +struct vega10_hwmgr *data = hwmgr->backend; +const struct phm_set_power_state_input *states = input;const struct vega10_power_state *vega10_ps =cast_const_phw_vega10_power_state (states->pnew_state);int i;
@@ -4042,7 +4036,7 @@ static int vega10_read_sensor(struct pp_hwmgr *hwmgr, int idx, ret = -EINVAL ; else { *size =sizeof (struct pp_gpu_power ); - ret =vega10_get_gpu_power (hwmgr, (struct pp_gpu_power *)value); + ret =vega10_get_gpu_power (hwmgr, value); }break ;default :
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +1 -1
@@ -647,7 +647,7 @@ int tf_vega10_thermal_start_smc_fan_control(struct pp_hwmgr *hwmgr,int tf_vega10_thermal_set_temperature_range (struct pp_hwmgr *hwmgr,void *input,void *output,void *storage,int result) { -struct PP_TemperatureRange *range = (struct PP_TemperatureRange *)input; +struct PP_TemperatureRange *range = input;if (range ==NULL )return -EINVAL ;
Signature · 1 line
2.11.0
kbuild test robot
build boturl: https://github.com/0day-ci/linux/commits/Harsha-Sharma/drm-amd-powerplay-Remove-unnecessary-cast-on-void-pointer/20171017-011426 config: x86_64-allmodconfig (attached as .config) compiler…
Hi Harsha,
[auto build test ERROR on v4.14-rc3]
[cannot apply to drm/drm-next next-20171018]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Harsha-Sharma/drm-amd-powerplay-Remove-unnecessary-cast-on-void-pointer/20171017-011426
config: x86_64-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64 All errors (new ones prefixed by >>):
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/smu7_hwmgr.c: In function 'smu7_get_pp_table_entry_callback_func_v1':
>> drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/smu7_hwmgr.c:2954:47: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
struct smu7_power_state *smu7_power_state = &(power_state->hardware);
^cc1: some warnings being treated as errors
vim +2954 drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/smu7_hwmgr.c
2948
2949 static int smu7_get_pp_table_entry_callback_func_v1(struct pp_hwmgr *hwmgr,
2950 void *state, struct pp_power_state *power_state,
2951 void *pp_table, uint32_t classification_flag)
2952 {
2953 struct smu7_hwmgr *data = hwmgr->backend;
> 2954 struct smu7_power_state *smu7_power_state = &(power_state->hardware);
2955 struct smu7_performance_level *performance_level;
2956 ATOM_Tonga_State *state_entry = state;
2957 ATOM_Tonga_POWERPLAYTABLE *powerplay_table = pp_table;
2958 PPTable_Generic_SubTable_Header *sclk_dep_table =
2959 (PPTable_Generic_SubTable_Header *)
2960 (((unsigned long)powerplay_table) +
2961 le16_to_cpu(powerplay_table->usSclkDependencyTableOffset));
2962
2963 ATOM_Tonga_MCLK_Dependency_Table *mclk_dep_table =
2964 (ATOM_Tonga_MCLK_Dependency_Table *)
2965 (((unsigned long)powerplay_table) +
2966 le16_to_cpu(powerplay_table->usMclkDependencyTableOffset));
2967
2968 /* The following fields are not initialized here: id orderedList allStatesList */
2969 power_state->classification.ui_label =
2970 (le16_to_cpu(state_entry->usClassification) &
2971 ATOM_PPLIB_CLASSIFICATION_UI_MASK) >>
2972 ATOM_PPLIB_CLASSIFICATION_UI_SHIFT;
2973 power_state->classification.flags = classification_flag;
2974 /* NOTE: There is a classification2 flag in BIOS that is not being used right now */
2975
2976 power_state->classification.temporary_state = false;
2977 power_state->classification.to_be_deleted = false;
2978
2979 power_state->validation.disallowOnDC =
2980 (0 != (le32_to_cpu(state_entry->ulCapsAndSettings) &
2981 ATOM_Tonga_DISALLOW_ON_DC));
2982
2983 power_state->pcie.lanes = 0;
2984
2985 power_state->display.disableFrameModulation = false;
2986 power_state->display.limitRefreshrate = false;
2987 power_state->display.enableVariBright =
2988 (0 != (le32_to_cpu(state_entry->ulCapsAndSettings) &
2989 ATOM_Tonga_ENABLE_VARIBRIGHT));
2990
2991 power_state->validation.supportedPowerLevels = 0;
2992 power_state->uvd_clocks.VCLK = 0;
2993 power_state->uvd_clocks.DCLK = 0;
2994 power_state->temperatures.min = 0;
2995 power_state->temperatures.max = 0;
2996
2997 performance_level = &(smu7_power_state->performance_levels
2998 [smu7_power_state->performance_level_count++]);
2999
3000 PP_ASSERT_WITH_CODE(
3001 (smu7_power_state->performance_level_count < smum_get_mac_definition(hwmgr->smumgr, SMU_MAX_LEVELS_GRAPHICS)),
3002 "Performance levels exceeds SMC limit!",
3003 return -EINVAL);
3004
3005 PP_ASSERT_WITH_CODE(
3006 (smu7_power_state->performance_level_count <=
3007 hwmgr->platform_descriptor.hardwareActivityPerformanceLevels),
3008 "Performance levels exceeds Driver limit!",
3009 return -EINVAL);
3010
3011 /* Performance levels are arranged from low to high. */
3012 performance_level->memory_clock = mclk_dep_table->entries
3013 [state_entry->ucMemoryClockIndexLow].ulMclk;
3014 if (sclk_dep_table->ucRevId == 0)
3015 performance_level->engine_clock = ((ATOM_Tonga_SCLK_Dependency_Table *)sclk_dep_table)->entries
3016 [state_entry->ucEngineClockIndexLow].ulSclk;
3017 else if (sclk_dep_table->ucRevId == 1)
3018 performance_level->engine_clock = ((ATOM_Polaris_SCLK_Dependency_Table *)sclk_dep_table)->entries
3019 [state_entry->ucEngineClockIndexLow].ulSclk;
3020 performance_level->pcie_gen = get_pcie_gen_support(data->pcie_gen_cap,
3021 state_entry->ucPCIEGenLow);
3022 performance_level->pcie_lane = get_pcie_lane_support(data->pcie_lane_cap,
3023 state_entry->ucPCIELaneHigh);
3024
3025 performance_level = &(smu7_power_state->performance_levels
3026 [smu7_power_state->performance_level_count++]);
3027 performance_level->memory_clock = mclk_dep_table->entries
3028 [state_entry->ucMemoryClockIndexHigh].ulMclk;
3029
3030 if (sclk_dep_table->ucRevId == 0)
3031 performance_level->engine_clock = ((ATOM_Tonga_SCLK_Dependency_Table *)sclk_dep_table)->entries
3032 [state_entry->ucEngineClockIndexHigh].ulSclk;
3033 else if (sclk_dep_table->ucRevId == 1)
3034 performance_level->engine_clock = ((ATOM_Polaris_SCLK_Dependency_Table *)sclk_dep_table)->entries
3035 [state_entry->ucEngineClockIndexHigh].ulSclk;
3036
3037 performance_level->pcie_gen = get_pcie_gen_support(data->pcie_gen_cap,
3038 state_entry->ucPCIEGenHigh);
3039 performance_level->pcie_lane = get_pcie_lane_support(data->pcie_lane_cap,
3040 state_entry->ucPCIELaneHigh);
3041
3042 return 0;
3043 }
3044
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx