OSDN Git Service

ice: remove u16 arithmetic in ice_gnss
authorKarol Kolacinski <karol.kolacinski@intel.com>
Fri, 29 Apr 2022 10:21:43 +0000 (12:21 +0200)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Wed, 8 Jun 2022 15:55:13 +0000 (08:55 -0700)
Change u16 to unsigned int where arithmetic occurs.

Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/ice/ice_gnss.c

index 57586a2..c6d755f 100644 (file)
@@ -17,13 +17,13 @@ static void ice_gnss_read(struct kthread_work *work)
        struct gnss_serial *gnss = container_of(work, struct gnss_serial,
                                                read_work.work);
        struct ice_aqc_link_topo_addr link_topo;
-       u8 i2c_params, bytes_read;
+       unsigned int i, bytes_read, data_len;
        struct tty_port *port;
        struct ice_pf *pf;
        struct ice_hw *hw;
        __be16 data_len_b;
        char *buf = NULL;
-       u16 i, data_len;
+       u8 i2c_params;
        int err = 0;
 
        pf = gnss->back;
@@ -65,7 +65,7 @@ static void ice_gnss_read(struct kthread_work *work)
                mdelay(10);
        }
 
-       data_len = min(data_len, (u16)PAGE_SIZE);
+       data_len = min_t(typeof(data_len), data_len, PAGE_SIZE);
        data_len = tty_buffer_request_room(port, data_len);
        if (!data_len) {
                err = -ENOMEM;
@@ -74,9 +74,10 @@ static void ice_gnss_read(struct kthread_work *work)
 
        /* Read received data */
        for (i = 0; i < data_len; i += bytes_read) {
-               u16 bytes_left = data_len - i;
+               unsigned int bytes_left = data_len - i;
 
-               bytes_read = min_t(typeof(bytes_left), bytes_left, ICE_MAX_I2C_DATA_SIZE);
+               bytes_read = min_t(typeof(bytes_left), bytes_left,
+                                  ICE_MAX_I2C_DATA_SIZE);
 
                err = ice_aq_read_i2c(hw, link_topo, ICE_GNSS_UBX_I2C_BUS_ADDR,
                                      cpu_to_le16(ICE_GNSS_UBX_EMPTY_DATA),