diff mbox series

[linux-next] r8152: Replace conditional statement with min() function

Message ID 20220914162326.23880-1-cui.jinpeng2@zte.com.cn
State New
Headers show
Series [linux-next] r8152: Replace conditional statement with min() function | expand

Commit Message

Lv Ruyi Sept. 14, 2022, 4:23 p.m. UTC
From: Jinpeng Cui <cui.jinpeng2@zte.com.cn>

Use the min() function instead of "if else" to get the minimum value.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Jinpeng Cui <cui.jinpeng2@zte.com.cn>
---
 drivers/net/usb/r8152.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

kernel test robot Sept. 16, 2022, 5:13 a.m. UTC | #1
Hi,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on next-20220914]

url:    https://github.com/intel-lab-lkp/linux/commits/cgel-zte-gmail-com/r8152-Replace-conditional-statement-with-min-function/20220915-002537
base:    f117c01187301a087412bd6697fcf5463cb427d8
config: x86_64-randconfig-a003 (https://download.01.org/0day-ci/archive/20220916/202209161313.2l3pzgCV-lkp@intel.com/config)
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/9b5f2fbac752d4608affde065cf64573bdd09564
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review cgel-zte-gmail-com/r8152-Replace-conditional-statement-with-min-function/20220915-002537
        git checkout 9b5f2fbac752d4608affde065cf64573bdd09564
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/net/usb/

If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

>> drivers/net/usb/r8152.c:4832:10: warning: comparison of distinct pointer types ('typeof (2048) *' (aka 'int *') and 'typeof (len) *' (aka 'unsigned int *')) [-Wcompare-distinct-pointer-types]
                   size = min(2048, len);
                          ^~~~~~~~~~~~~~
   include/linux/minmax.h:45:19: note: expanded from macro 'min'
   #define min(x, y)       __careful_cmp(x, y, <)
                           ^~~~~~~~~~~~~~~~~~~~~~
   include/linux/minmax.h:36:24: note: expanded from macro '__careful_cmp'
           __builtin_choose_expr(__safe_cmp(x, y), \
                                 ^~~~~~~~~~~~~~~~
   include/linux/minmax.h:26:4: note: expanded from macro '__safe_cmp'
                   (__typecheck(x, y) && __no_side_effects(x, y))
                    ^~~~~~~~~~~~~~~~~
   include/linux/minmax.h:20:28: note: expanded from macro '__typecheck'
           (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
                      ~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~
   1 warning generated.


vim +4832 drivers/net/usb/r8152.c

  4808	
  4809	static void rtl_ram_code_speed_up(struct r8152 *tp, struct fw_phy_speed_up *phy, bool wait)
  4810	{
  4811		u32 len;
  4812		u8 *data;
  4813	
  4814		rtl_reset_ocp_base(tp);
  4815	
  4816		if (sram_read(tp, SRAM_GPHY_FW_VER) >= __le16_to_cpu(phy->version)) {
  4817			dev_dbg(&tp->intf->dev, "PHY firmware has been the newest\n");
  4818			return;
  4819		}
  4820	
  4821		len = __le32_to_cpu(phy->blk_hdr.length);
  4822		len -= __le16_to_cpu(phy->fw_offset);
  4823		data = (u8 *)phy + __le16_to_cpu(phy->fw_offset);
  4824	
  4825		if (rtl_phy_patch_request(tp, true, wait))
  4826			return;
  4827	
  4828		while (len) {
  4829			u32 ocp_data, size;
  4830			int i;
  4831	
> 4832			size = min(2048, len);
  4833	
  4834			ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL);
  4835			ocp_data |= GPHY_PATCH_DONE | BACKUP_RESTRORE;
  4836			ocp_write_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL, ocp_data);
  4837	
  4838			generic_ocp_write(tp, __le16_to_cpu(phy->fw_reg), 0xff, size, data, MCU_TYPE_USB);
  4839	
  4840			data += size;
  4841			len -= size;
  4842	
  4843			ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL);
  4844			ocp_data |= POL_GPHY_PATCH;
  4845			ocp_write_word(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL, ocp_data);
  4846	
  4847			for (i = 0; i < 1000; i++) {
  4848				if (!(ocp_read_word(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL) & POL_GPHY_PATCH))
  4849					break;
  4850			}
  4851	
  4852			if (i == 1000) {
  4853				dev_err(&tp->intf->dev, "ram code speedup mode timeout\n");
  4854				break;
  4855			}
  4856		}
  4857	
  4858		rtl_reset_ocp_base(tp);
  4859	
  4860		rtl_phy_patch_request(tp, false, wait);
  4861	
  4862		if (sram_read(tp, SRAM_GPHY_FW_VER) == __le16_to_cpu(phy->version))
  4863			dev_dbg(&tp->intf->dev, "successfully applied %s\n", phy->info);
  4864		else
  4865			dev_err(&tp->intf->dev, "ram code speedup mode fail\n");
  4866	}
  4867
diff mbox series

Patch

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index a51d8ded60f3..6cead36aef56 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -4829,10 +4829,7 @@  static void rtl_ram_code_speed_up(struct r8152 *tp, struct fw_phy_speed_up *phy,
 		u32 ocp_data, size;
 		int i;
 
-		if (len < 2048)
-			size = len;
-		else
-			size = 2048;
+		size = min(2048, len);
 
 		ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL);
 		ocp_data |= GPHY_PATCH_DONE | BACKUP_RESTRORE;