tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: pac1921: remove unnecessary explicit casts

Many explicit casts were introduced to address Wconversion and
Wsign-compare warnings. Remove them to improve readability.

Link: https://lore.kernel.org/linux-iio/1fa4ab12-0939-477d-bc92-306fd32e4fd9@stanley.mountain/
Signed-off-by: Matteo Martelli <matteomartelli3@gmail.com>
Link: https://patch.msgid.link/20240930-iio-pac1921-nocast-v2-1-cc349e137f75@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Matteo Martelli and committed by
Jonathan Cameron a9bb0610 fc04cc73

+19 -20
+19 -20
drivers/iio/adc/pac1921.c
··· 241 241 s64 tmp; 242 242 243 243 tmp = div_s64(dividend * (s64)NANO, divisor); 244 - *val = (int)div_s64_rem(tmp, NANO, val2); 244 + *val = div_s64_rem(tmp, NANO, val2); 245 245 } 246 246 247 247 /* ··· 260 260 int max = (PAC1921_MAX_VSENSE_MV * MICRO) >> i; 261 261 int vsense_lsb = DIV_ROUND_CLOSEST(max, PAC1921_RES_RESOLUTION); 262 262 263 - pac1921_calc_scale(vsense_lsb, (int)priv->rshunt_uohm, 263 + pac1921_calc_scale(vsense_lsb, priv->rshunt_uohm, 264 264 &priv->current_scales[i][0], 265 265 &priv->current_scales[i][1]); 266 266 } ··· 314 314 timestamp); 315 315 } 316 316 317 - priv->prev_ovf_flags = (u8)flags; 317 + priv->prev_ovf_flags = flags; 318 318 319 319 return 0; 320 320 } ··· 329 329 static int pac1921_read_res(struct pac1921_priv *priv, unsigned long reg, 330 330 u16 *val) 331 331 { 332 - int ret = regmap_bulk_read(priv->regmap, (unsigned int)reg, val, 333 - sizeof(*val)); 332 + int ret = regmap_bulk_read(priv->regmap, reg, val, sizeof(*val)); 334 333 if (ret) 335 334 return ret; 336 335 ··· 365 366 if (ret) 366 367 return ret; 367 368 368 - *val = (int)res_val; 369 + *val = res_val; 369 370 370 371 return IIO_VAL_INT; 371 372 } ··· 399 400 s64 tmp = curr_scale[0] * (s64)NANO + curr_scale[1]; 400 401 401 402 /* Multiply by max_vbus (V) / dv_gain */ 402 - tmp *= PAC1921_MAX_VBUS_V >> (int)priv->dv_gain; 403 + tmp *= PAC1921_MAX_VBUS_V >> priv->dv_gain; 403 404 404 405 /* Convert back to INT_PLUS_NANO */ 405 - *val = (int)div_s64_rem(tmp, NANO, val2); 406 + *val = div_s64_rem(tmp, NANO, val2); 406 407 407 408 return IIO_VAL_INT_PLUS_NANO; 408 409 } ··· 425 426 * 1/(integr_period_usecs/MICRO) = MICRO/integr_period_usecs 426 427 */ 427 428 *val = MICRO; 428 - *val2 = (int)priv->integr_period_usecs; 429 + *val2 = priv->integr_period_usecs; 429 430 return IIO_VAL_FRACTIONAL; 430 431 431 432 default: ··· 502 503 for (unsigned int i = 0; i < size; i++) 503 504 if (scales_tbl[i][0] == scale_val && 504 505 scales_tbl[i][1] == scale_val2) 505 - return (int)i; 506 + return i; 506 507 507 508 return -EINVAL; 508 509 } ··· 552 553 if (ret < 0) 553 554 return ret; 554 555 555 - return pac1921_update_gain(priv, &priv->dv_gain, (u8)ret, 556 + return pac1921_update_gain(priv, &priv->dv_gain, ret, 556 557 PAC1921_GAIN_DV_GAIN_MASK); 557 558 case PAC1921_CHAN_VSENSE: 558 559 ret = pac1921_lookup_scale(pac1921_vsense_scales, ··· 561 562 if (ret < 0) 562 563 return ret; 563 564 564 - return pac1921_update_gain(priv, &priv->di_gain, (u8)ret, 565 + return pac1921_update_gain(priv, &priv->di_gain, ret, 565 566 PAC1921_GAIN_DI_GAIN_MASK); 566 567 case PAC1921_CHAN_CURRENT: 567 568 ret = pac1921_lookup_scale(priv->current_scales, ··· 570 571 if (ret < 0) 571 572 return ret; 572 573 573 - return pac1921_update_gain(priv, &priv->di_gain, (u8)ret, 574 + return pac1921_update_gain(priv, &priv->di_gain, ret, 574 575 PAC1921_GAIN_DI_GAIN_MASK); 575 576 default: 576 577 return -EINVAL; ··· 585 586 { 586 587 for (unsigned int i = 0; i < ARRAY_SIZE(pac1921_int_num_samples); i++) 587 588 if (pac1921_int_num_samples[i] == num_samples) 588 - return (int)i; 589 + return i; 589 590 590 591 return -EINVAL; 591 592 } ··· 606 607 if (ret < 0) 607 608 return ret; 608 609 609 - n_samples = (u8)ret; 610 + n_samples = ret; 610 611 611 612 if (priv->n_samples == n_samples) 612 613 return 0; ··· 769 770 770 771 guard(mutex)(&priv->lock); 771 772 772 - vals[0] = (int)priv->rshunt_uohm; 773 + vals[0] = priv->rshunt_uohm; 773 774 vals[1] = MICRO; 774 775 775 776 return iio_format_value(buf, IIO_VAL_FRACTIONAL, 1, vals); ··· 792 793 if (ret) 793 794 return ret; 794 795 795 - rshunt_uohm = (u32)val * MICRO + (u32)val_fract; 796 + rshunt_uohm = val * MICRO + val_fract; 796 797 if (rshunt_uohm == 0 || rshunt_uohm > INT_MAX) 797 798 return -EINVAL; 798 799 799 800 guard(mutex)(&priv->lock); 800 801 801 - priv->rshunt_uohm = (u32)rshunt_uohm; 802 + priv->rshunt_uohm = rshunt_uohm; 802 803 803 804 pac1921_calc_current_scales(priv); 804 805 ··· 1167 1168 1168 1169 priv->regmap = devm_regmap_init_i2c(client, &pac1921_regmap_config); 1169 1170 if (IS_ERR(priv->regmap)) 1170 - return dev_err_probe(dev, (int)PTR_ERR(priv->regmap), 1171 + return dev_err_probe(dev, PTR_ERR(priv->regmap), 1171 1172 "Cannot initialize register map\n"); 1172 1173 1173 1174 devm_mutex_init(dev, &priv->lock); ··· 1190 1191 1191 1192 priv->vdd = devm_regulator_get(dev, "vdd"); 1192 1193 if (IS_ERR(priv->vdd)) 1193 - return dev_err_probe(dev, (int)PTR_ERR(priv->vdd), 1194 + return dev_err_probe(dev, PTR_ERR(priv->vdd), 1194 1195 "Cannot get vdd regulator\n"); 1195 1196 1196 1197 ret = regulator_enable(priv->vdd);