staging: iio: adt7316: replace sprintf() with sysfs_emit()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Convert several sprintf() calls to sysfs_emit() in the
sysfs show functions, as it is the preferred helper and
prevents potential buffer overruns.

No functional changes intended.

Signed-off-by: Shi Hao <i.shihao.999@gmail.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Shi Hao and committed by

Jonathan Cameron 4 months ago f9e05791 02d44a1b

+51 -51

1 changed file

expand all

drivers

staging

iio

addac

adt7316.c

+51 -51

drivers/staging/iio/addac/adt7316.c

··· 216 216 struct iio_dev *dev_info = dev_to_iio_dev(dev); 217 217 struct adt7316_chip_info *chip = iio_priv(dev_info); 218 218 219 - return sprintf(buf, "%d\n", !!(chip->config1 & ADT7316_EN)); 219 + return sysfs_emit(buf, "%d\n", !!(chip->config1 & ADT7316_EN)); 220 220 } 221 221 222 222 static ssize_t _adt7316_store_enabled(struct adt7316_chip_info *chip, ··· 274 274 if ((chip->id & ID_FAMILY_MASK) != ID_ADT75XX) 275 275 return -EPERM; 276 276 277 - return sprintf(buf, "%d\n", !!(chip->config1 & ADT7516_SEL_EX_TEMP)); 277 + return sysfs_emit(buf, "%d\n", !!(chip->config1 & ADT7516_SEL_EX_TEMP)); 278 278 } 279 279 280 280 static ssize_t adt7316_store_select_ex_temp(struct device *dev, ··· 316 316 struct adt7316_chip_info *chip = iio_priv(dev_info); 317 317 318 318 if (chip->config2 & ADT7316_AD_SINGLE_CH_MODE) 319 - return sprintf(buf, "single_channel\n"); 319 + return sysfs_emit(buf, "single_channel\n"); 320 320 321 - return sprintf(buf, "round_robin\n"); 321 + return sysfs_emit(buf, "round_robin\n"); 322 322 } 323 323 324 324 static ssize_t adt7316_store_mode(struct device *dev, ··· 353 353 struct device_attribute *attr, 354 354 char *buf) 355 355 { 356 - return sprintf(buf, "single_channel\nround_robin\n"); 356 + return sysfs_emit(buf, "single_channel\nround_robin\n"); 357 357 } 358 358 359 359 static IIO_DEVICE_ATTR(all_modes, 0444, adt7316_show_all_modes, NULL, 0); ··· 370 370 371 371 switch (chip->config2 & ADT7516_AD_SINGLE_CH_MASK) { 372 372 case ADT7316_AD_SINGLE_CH_VDD: 373 - return sprintf(buf, "0 - VDD\n"); 373 + return sysfs_emit(buf, "0 - VDD\n"); 374 374 case ADT7316_AD_SINGLE_CH_IN: 375 - return sprintf(buf, "1 - Internal Temperature\n"); 375 + return sysfs_emit(buf, "1 - Internal Temperature\n"); 376 376 case ADT7316_AD_SINGLE_CH_EX: 377 377 if (((chip->id & ID_FAMILY_MASK) == ID_ADT75XX) && 378 378 (chip->config1 & ADT7516_SEL_AIN1_2_EX_TEMP_MASK) == 0) 379 - return sprintf(buf, "2 - AIN1\n"); 379 + return sysfs_emit(buf, "2 - AIN1\n"); 380 380 381 - return sprintf(buf, "2 - External Temperature\n"); 381 + return sysfs_emit(buf, "2 - External Temperature\n"); 382 382 case ADT7516_AD_SINGLE_CH_AIN2: 383 383 if ((chip->config1 & ADT7516_SEL_AIN1_2_EX_TEMP_MASK) == 0) 384 - return sprintf(buf, "3 - AIN2\n"); 384 + return sysfs_emit(buf, "3 - AIN2\n"); 385 385 386 - return sprintf(buf, "N/A\n"); 386 + return sysfs_emit(buf, "N/A\n"); 387 387 case ADT7516_AD_SINGLE_CH_AIN3: 388 388 if (chip->config1 & ADT7516_SEL_AIN3) 389 - return sprintf(buf, "4 - AIN3\n"); 389 + return sysfs_emit(buf, "4 - AIN3\n"); 390 390 391 - return sprintf(buf, "N/A\n"); 391 + return sysfs_emit(buf, "N/A\n"); 392 392 case ADT7516_AD_SINGLE_CH_AIN4: 393 - return sprintf(buf, "5 - AIN4\n"); 393 + return sysfs_emit(buf, "5 - AIN4\n"); 394 394 default: 395 - return sprintf(buf, "N/A\n"); 395 + return sysfs_emit(buf, "N/A\n"); 396 396 } 397 397 } 398 398 ··· 453 453 return -EPERM; 454 454 455 455 if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX) 456 - return sprintf(buf, "0 - VDD\n1 - Internal Temperature\n" 456 + return sysfs_emit(buf, "0 - VDD\n1 - Internal Temperature\n" 457 457 "2 - External Temperature or AIN1\n" 458 458 "3 - AIN2\n4 - AIN3\n5 - AIN4\n"); 459 - return sprintf(buf, "0 - VDD\n1 - Internal Temperature\n" 459 + return sysfs_emit(buf, "0 - VDD\n1 - Internal Temperature\n" 460 460 "2 - External Temperature\n"); 461 461 } 462 462 ··· 470 470 struct iio_dev *dev_info = dev_to_iio_dev(dev); 471 471 struct adt7316_chip_info *chip = iio_priv(dev_info); 472 472 473 - return sprintf(buf, "%d\n", 473 + return sysfs_emit(buf, "%d\n", 474 474 !!(chip->config2 & ADT7316_DISABLE_AVERAGING)); 475 475 } 476 476 ··· 509 509 struct iio_dev *dev_info = dev_to_iio_dev(dev); 510 510 struct adt7316_chip_info *chip = iio_priv(dev_info); 511 511 512 - return sprintf(buf, "%d\n", 512 + return sysfs_emit(buf, "%d\n", 513 513 !!(chip->config2 & ADT7316_EN_SMBUS_TIMEOUT)); 514 514 } 515 515 ··· 548 548 struct iio_dev *dev_info = dev_to_iio_dev(dev); 549 549 struct adt7316_chip_info *chip = iio_priv(dev_info); 550 550 551 - return sprintf(buf, "%d\n", !!(chip->config1 & ADT7316_PD)); 551 + return sysfs_emit(buf, "%d\n", !!(chip->config1 & ADT7316_PD)); 552 552 } 553 553 554 554 static ssize_t adt7316_store_powerdown(struct device *dev, ··· 586 586 struct iio_dev *dev_info = dev_to_iio_dev(dev); 587 587 struct adt7316_chip_info *chip = iio_priv(dev_info); 588 588 589 - return sprintf(buf, "%d\n", !!(chip->config3 & ADT7316_ADCLK_22_5)); 589 + return sysfs_emit(buf, "%d\n", !!(chip->config3 & ADT7316_ADCLK_22_5)); 590 590 } 591 591 592 592 static ssize_t adt7316_store_fast_ad_clock(struct device *dev, ··· 626 626 627 627 if (chip->config3 & ADT7316_DA_HIGH_RESOLUTION) { 628 628 if (chip->id != ID_ADT7318 && chip->id != ID_ADT7519) 629 - return sprintf(buf, "1 (10 bits)\n"); 629 + return sysfs_emit(buf, "1 (10 bits)\n"); 630 630 } 631 631 632 - return sprintf(buf, "0 (8 bits)\n"); 632 + return sysfs_emit(buf, "0 (8 bits)\n"); 633 633 } 634 634 635 635 static ssize_t adt7316_store_da_high_resolution(struct device *dev, ··· 673 673 if ((chip->id & ID_FAMILY_MASK) != ID_ADT75XX) 674 674 return -EPERM; 675 675 676 - return sprintf(buf, "%d\n", 676 + return sysfs_emit(buf, "%d\n", 677 677 !!(chip->config3 & ADT7516_AIN_IN_VREF)); 678 678 } 679 679 ··· 716 716 struct iio_dev *dev_info = dev_to_iio_dev(dev); 717 717 struct adt7316_chip_info *chip = iio_priv(dev_info); 718 718 719 - return sprintf(buf, "%d\n", 719 + return sysfs_emit(buf, "%d\n", 720 720 !!(chip->config3 & ADT7316_EN_IN_TEMP_PROP_DACA)); 721 721 } 722 722 ··· 755 755 struct iio_dev *dev_info = dev_to_iio_dev(dev); 756 756 struct adt7316_chip_info *chip = iio_priv(dev_info); 757 757 758 - return sprintf(buf, "%d\n", 758 + return sysfs_emit(buf, "%d\n", 759 759 !!(chip->config3 & ADT7316_EN_EX_TEMP_PROP_DACB)); 760 760 } 761 761 ··· 794 794 struct iio_dev *dev_info = dev_to_iio_dev(dev); 795 795 struct adt7316_chip_info *chip = iio_priv(dev_info); 796 796 797 - return sprintf(buf, "0x%x\n", 797 + return sysfs_emit(buf, "0x%x\n", 798 798 chip->dac_config & ADT7316_DA_2VREF_CH_MASK); 799 799 } 800 800 ··· 838 838 struct adt7316_chip_info *chip = iio_priv(dev_info); 839 839 840 840 if (!(chip->config3 & ADT7316_DA_EN_VIA_DAC_LDAC)) 841 - return sprintf(buf, "manual\n"); 841 + return sysfs_emit(buf, "manual\n"); 842 842 843 843 switch (chip->dac_config & ADT7316_DA_EN_MODE_MASK) { 844 844 case ADT7316_DA_EN_MODE_SINGLE: 845 - return sprintf(buf, 845 + return sysfs_emit(buf, 846 846 "0 - auto at any MSB DAC writing\n"); 847 847 case ADT7316_DA_EN_MODE_AB_CD: 848 - return sprintf(buf, 848 + return sysfs_emit(buf, 849 849 "1 - auto at MSB DAC AB and CD writing\n"); 850 850 case ADT7316_DA_EN_MODE_ABCD: 851 - return sprintf(buf, 851 + return sysfs_emit(buf, 852 852 "2 - auto at MSB DAC ABCD writing\n"); 853 853 default: /* ADT7316_DA_EN_MODE_LDAC */ 854 - return sprintf(buf, "3 - manual\n"); 854 + return sysfs_emit(buf, "3 - manual\n"); 855 855 } 856 856 } 857 857 ··· 898 898 struct adt7316_chip_info *chip = iio_priv(dev_info); 899 899 900 900 if (chip->config3 & ADT7316_DA_EN_VIA_DAC_LDAC) 901 - return sprintf(buf, "0 - auto at any MSB DAC writing\n" 901 + return sysfs_emit(buf, "0 - auto at any MSB DAC writing\n" 902 902 "1 - auto at MSB DAC AB and CD writing\n" 903 903 "2 - auto at MSB DAC ABCD writing\n" 904 904 "3 - manual\n"); 905 - return sprintf(buf, "manual\n"); 905 + return sysfs_emit(buf, "manual\n"); 906 906 } 907 907 908 908 static IIO_DEVICE_ATTR(all_DAC_update_modes, 0444, ··· 955 955 struct iio_dev *dev_info = dev_to_iio_dev(dev); 956 956 struct adt7316_chip_info *chip = iio_priv(dev_info); 957 957 958 - return sprintf(buf, "%d\n", 958 + return sysfs_emit(buf, "%d\n", 959 959 !!(chip->dac_config & ADT7316_VREF_BYPASS_DAC_AB)); 960 960 } 961 961 ··· 994 994 struct iio_dev *dev_info = dev_to_iio_dev(dev); 995 995 struct adt7316_chip_info *chip = iio_priv(dev_info); 996 996 997 - return sprintf(buf, "%d\n", 997 + return sysfs_emit(buf, "%d\n", 998 998 !!(chip->dac_config & ADT7316_VREF_BYPASS_DAC_CD)); 999 999 } 1000 1000 ··· 1034 1034 struct adt7316_chip_info *chip = iio_priv(dev_info); 1035 1035 1036 1036 if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX) 1037 - return sprintf(buf, "0x%x\n", 1037 + return sysfs_emit(buf, "0x%x\n", 1038 1038 (chip->ldac_config & ADT7516_DAC_IN_VREF_MASK) >> 1039 1039 ADT7516_DAC_IN_VREF_OFFSET); 1040 - return sprintf(buf, "%d\n", 1040 + return sysfs_emit(buf, "%d\n", 1041 1041 !!(chip->ldac_config & ADT7316_DAC_IN_VREF)); 1042 1042 } 1043 1043 ··· 1128 1128 1129 1129 data = msb << ADT7316_T_VALUE_FLOAT_OFFSET; 1130 1130 data |= (lsb & ADT7316_LSB_VDD_MASK) >> ADT7316_LSB_VDD_OFFSET; 1131 - return sprintf(buf, "%d\n", data); 1131 + return sysfs_emit(buf, "%d\n", data); 1132 1132 default: /* ex_temp and ain */ 1133 1133 ret = chip->bus.read(chip->bus.client, 1134 1134 ADT7316_LSB_EX_TEMP_AIN, &lsb); ··· 1146 1146 (ADT7316_MSB_EX_TEMP - ADT7316_AD_MSB_DATA_BASE)))); 1147 1147 1148 1148 if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX) 1149 - return sprintf(buf, "%d\n", data); 1149 + return sysfs_emit(buf, "%d\n", data); 1150 1150 1151 1151 break; 1152 1152 } ··· 1157 1157 sign = '-'; 1158 1158 } 1159 1159 1160 - return sprintf(buf, "%c%d.%.2d\n", sign, 1160 + return sysfs_emit(buf, "%c%d.%.2d\n", sign, 1161 1161 (data >> ADT7316_T_VALUE_FLOAT_OFFSET), 1162 1162 (data & ADT7316_T_VALUE_FLOAT_MASK) * 25); 1163 1163 } ··· 1247 1247 if (val & 0x80) 1248 1248 data -= 256; 1249 1249 1250 - return sprintf(buf, "%d\n", data); 1250 + return sysfs_emit(buf, "%d\n", data); 1251 1251 } 1252 1252 1253 1253 static ssize_t adt7316_store_temp_offset(struct adt7316_chip_info *chip, ··· 1415 1415 data = lsb >> ADT7316_DA_10_BIT_LSB_SHIFT; 1416 1416 data |= msb << offset; 1417 1417 1418 - return sprintf(buf, "%d\n", data); 1418 + return sysfs_emit(buf, "%d\n", data); 1419 1419 } 1420 1420 1421 1421 static ssize_t adt7316_store_DAC(struct adt7316_chip_info *chip, ··· 1568 1568 if (ret) 1569 1569 return -EIO; 1570 1570 1571 - return sprintf(buf, "%d\n", id); 1571 + return sysfs_emit(buf, "%d\n", id); 1572 1572 } 1573 1573 1574 1574 static IIO_DEVICE_ATTR(device_id, 0444, adt7316_show_device_id, NULL, 0); ··· 1586 1586 if (ret) 1587 1587 return -EIO; 1588 1588 1589 - return sprintf(buf, "%d\n", id); 1589 + return sysfs_emit(buf, "%d\n", id); 1590 1590 } 1591 1591 1592 1592 static IIO_DEVICE_ATTR(manufactorer_id, 0444, ··· 1605 1605 if (ret) 1606 1606 return -EIO; 1607 1607 1608 - return sprintf(buf, "%d\n", rev); 1608 + return sysfs_emit(buf, "%d\n", rev); 1609 1609 } 1610 1610 1611 1611 static IIO_DEVICE_ATTR(device_rev, 0444, adt7316_show_device_rev, NULL, 0); ··· 1624 1624 return -EIO; 1625 1625 1626 1626 if (stat) 1627 - return sprintf(buf, "spi\n"); 1627 + return sysfs_emit(buf, "spi\n"); 1628 1628 1629 - return sprintf(buf, "i2c\n"); 1629 + return sysfs_emit(buf, "i2c\n"); 1630 1630 } 1631 1631 1632 1632 static IIO_DEVICE_ATTR(bus_type, 0444, adt7316_show_bus_type, NULL, 0); ··· 1836 1836 struct iio_dev *dev_info = dev_to_iio_dev(dev); 1837 1837 struct adt7316_chip_info *chip = iio_priv(dev_info); 1838 1838 1839 - return sprintf(buf, "0x%x\n", chip->int_mask); 1839 + return sysfs_emit(buf, "0x%x\n", chip->int_mask); 1840 1840 } 1841 1841 1842 1842 /* ··· 1910 1910 data -= 256; 1911 1911 } 1912 1912 1913 - return sprintf(buf, "%d\n", data); 1913 + return sysfs_emit(buf, "%d\n", data); 1914 1914 } 1915 1915 1916 1916 static inline ssize_t adt7316_set_ad_bound(struct device *dev, ··· 1961 1961 struct iio_dev *dev_info = dev_to_iio_dev(dev); 1962 1962 struct adt7316_chip_info *chip = iio_priv(dev_info); 1963 1963 1964 - return sprintf(buf, "%d\n", !!(chip->config1 & ADT7316_INT_EN)); 1964 + return sysfs_emit(buf, "%d\n", !!(chip->config1 & ADT7316_INT_EN)); 1965 1965 } 1966 1966 1967 1967 static ssize_t adt7316_set_int_enabled(struct device *dev,