Skip to content

Commit

Permalink
ice: remove u16 arithmetic in ice_gnss
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Karol Kolacinski authored and Tony Nguyen committed Jun 8, 2022
1 parent b33de56 commit 0a3ca08
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/net/ethernet/intel/ice/ice_gnss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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),
Expand Down

0 comments on commit 0a3ca08

Please sign in to comment.