]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/amd/powerplay: change condition judgment as function's return value changed.
authorRex Zhu <Rex.Zhu@amd.com>
Wed, 29 Jun 2016 11:48:58 +0000 (19:48 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 7 Jul 2016 19:06:05 +0000 (15:06 -0400)
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c

index ff25098b82e4db7692df5af9593a0e15ebca4c1b..6c4553cf80230f381aeceedfd29774f80205170f 100644 (file)
@@ -3026,8 +3026,8 @@ int tonga_init_smc_table(struct pp_hwmgr *hwmgr)
 
        reg_value = 0;
        if ((0 == reg_value) &&
-               (0 == atomctrl_get_pp_assign_pin(hwmgr,
-                       VDDC_VRHOT_GPIO_PINID, &gpio_pin_assignment))) {
+               (atomctrl_get_pp_assign_pin(hwmgr, VDDC_VRHOT_GPIO_PINID,
+                                               &gpio_pin_assignment))) {
                table->VRHotGpio = gpio_pin_assignment.uc_gpio_pin_bit_shift;
                phm_cap_set(hwmgr->platform_descriptor.platformCaps,
                        PHM_PlatformCaps_RegulatorHot);
@@ -3040,8 +3040,8 @@ int tonga_init_smc_table(struct pp_hwmgr *hwmgr)
        /* ACDC Switch GPIO */
        reg_value = 0;
        if ((0 == reg_value) &&
-               (0 == atomctrl_get_pp_assign_pin(hwmgr,
-                       PP_AC_DC_SWITCH_GPIO_PINID, &gpio_pin_assignment))) {
+               (atomctrl_get_pp_assign_pin(hwmgr, PP_AC_DC_SWITCH_GPIO_PINID,
+                                               &gpio_pin_assignment))) {
                table->AcDcGpio = gpio_pin_assignment.uc_gpio_pin_bit_shift;
                phm_cap_set(hwmgr->platform_descriptor.platformCaps,
                        PHM_PlatformCaps_AutomaticDCTransition);
@@ -3063,8 +3063,7 @@ int tonga_init_smc_table(struct pp_hwmgr *hwmgr)
        }
 
        reg_value = 0;
-       if ((0 == reg_value) &&
-               (0 == atomctrl_get_pp_assign_pin(hwmgr,
+       if ((0 == reg_value) && (atomctrl_get_pp_assign_pin(hwmgr,
                        THERMAL_INT_OUTPUT_GPIO_PINID, &gpio_pin_assignment))) {
                phm_cap_set(hwmgr->platform_descriptor.platformCaps,
                        PHM_PlatformCaps_ThermalOutGPIO);
@@ -4570,7 +4569,7 @@ int tonga_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
        * if ucGPIO_ID=VDDC_PCC_GPIO_PINID in GPIO_LUTable,
        * Peak Current Control feature is enabled and we should program PCC HW register
        */
-       if (0 == atomctrl_get_pp_assign_pin(hwmgr, VDDC_PCC_GPIO_PINID, &gpio_pin_assignment)) {
+       if (atomctrl_get_pp_assign_pin(hwmgr, VDDC_PCC_GPIO_PINID, &gpio_pin_assignment)) {
                uint32_t temp_reg = cgs_read_ind_register(hwmgr->device,
                                                                                CGS_IND_REG__SMC, ixCNB_PWRMGT_CNTL);