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

staging:iio:ade7xxx: Don't expose the chip reset to userspace

There is no reason why userspace should want to trigger a manual reset of the
device, so remove this functionality.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

authored by

Lars-Peter Clausen and committed by
Jonathan Cameron
661a60b1 aae6e9eb

-92
-18
drivers/staging/iio/meter/ade7753.c
··· 225 225 return ade7753_spi_write_reg_16(dev, ADE7753_MODE, val); 226 226 } 227 227 228 - static ssize_t ade7753_write_reset(struct device *dev, 229 - struct device_attribute *attr, 230 - const char *buf, size_t len) 231 - { 232 - if (len < 1) 233 - return -1; 234 - switch (buf[0]) { 235 - case '1': 236 - case 'y': 237 - case 'Y': 238 - return ade7753_reset(dev); 239 - } 240 - return -1; 241 - } 242 - 243 228 static IIO_DEV_ATTR_AENERGY(ade7753_read_24bit, ADE7753_AENERGY); 244 229 static IIO_DEV_ATTR_LAENERGY(ade7753_read_24bit, ADE7753_LAENERGY); 245 230 static IIO_DEV_ATTR_VAENERGY(ade7753_read_24bit, ADE7753_VAENERGY); ··· 443 458 ade7753_read_frequency, 444 459 ade7753_write_frequency); 445 460 446 - static IIO_DEV_ATTR_RESET(ade7753_write_reset); 447 - 448 461 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("27900 14000 7000 3500"); 449 462 450 463 static struct attribute *ade7753_attributes[] = { ··· 451 468 &iio_const_attr_in_temp_scale.dev_attr.attr, 452 469 &iio_dev_attr_sampling_frequency.dev_attr.attr, 453 470 &iio_const_attr_sampling_frequency_available.dev_attr.attr, 454 - &iio_dev_attr_reset.dev_attr.attr, 455 471 &iio_dev_attr_phcal.dev_attr.attr, 456 472 &iio_dev_attr_cfden.dev_attr.attr, 457 473 &iio_dev_attr_aenergy.dev_attr.attr,
-19
drivers/staging/iio/meter/ade7754.c
··· 224 224 return ade7754_spi_write_reg_8(dev, ADE7754_OPMODE, val); 225 225 } 226 226 227 - 228 - static ssize_t ade7754_write_reset(struct device *dev, 229 - struct device_attribute *attr, 230 - const char *buf, size_t len) 231 - { 232 - if (len < 1) 233 - return -1; 234 - switch (buf[0]) { 235 - case '1': 236 - case 'y': 237 - case 'Y': 238 - return ade7754_reset(dev); 239 - } 240 - return -1; 241 - } 242 - 243 227 static IIO_DEV_ATTR_AENERGY(ade7754_read_24bit, ADE7754_AENERGY); 244 228 static IIO_DEV_ATTR_LAENERGY(ade7754_read_24bit, ADE7754_LAENERGY); 245 229 static IIO_DEV_ATTR_VAENERGY(ade7754_read_24bit, ADE7754_VAENERGY); ··· 462 478 ade7754_read_frequency, 463 479 ade7754_write_frequency); 464 480 465 - static IIO_DEV_ATTR_RESET(ade7754_write_reset); 466 - 467 481 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("26000 13000 65000 33000"); 468 482 469 483 static struct attribute *ade7754_attributes[] = { ··· 470 488 &iio_const_attr_in_temp_scale.dev_attr.attr, 471 489 &iio_dev_attr_sampling_frequency.dev_attr.attr, 472 490 &iio_const_attr_sampling_frequency_available.dev_attr.attr, 473 - &iio_dev_attr_reset.dev_attr.attr, 474 491 &iio_dev_attr_aenergy.dev_attr.attr, 475 492 &iio_dev_attr_laenergy.dev_attr.attr, 476 493 &iio_dev_attr_vaenergy.dev_attr.attr,
-18
drivers/staging/iio/meter/ade7758_core.c
··· 313 313 return ret; 314 314 } 315 315 316 - static ssize_t ade7758_write_reset(struct device *dev, 317 - struct device_attribute *attr, 318 - const char *buf, size_t len) 319 - { 320 - if (len < 1) 321 - return -1; 322 - switch (buf[0]) { 323 - case '1': 324 - case 'y': 325 - case 'Y': 326 - return ade7758_reset(dev); 327 - } 328 - return len; 329 - } 330 - 331 316 static IIO_DEV_ATTR_VPEAK(S_IWUSR | S_IRUGO, 332 317 ade7758_read_8bit, 333 318 ade7758_write_8bit, ··· 576 591 ade7758_read_frequency, 577 592 ade7758_write_frequency); 578 593 579 - static IIO_DEV_ATTR_RESET(ade7758_write_reset); 580 - 581 594 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("26040 13020 6510 3255"); 582 595 583 596 static struct attribute *ade7758_attributes[] = { ··· 584 601 &iio_const_attr_in_temp_scale.dev_attr.attr, 585 602 &iio_dev_attr_sampling_frequency.dev_attr.attr, 586 603 &iio_const_attr_sampling_frequency_available.dev_attr.attr, 587 - &iio_dev_attr_reset.dev_attr.attr, 588 604 &iio_dev_attr_awatthr.dev_attr.attr, 589 605 &iio_dev_attr_bwatthr.dev_attr.attr, 590 606 &iio_dev_attr_cwatthr.dev_attr.attr,
-18
drivers/staging/iio/meter/ade7759.c
··· 229 229 return ret; 230 230 } 231 231 232 - static ssize_t ade7759_write_reset(struct device *dev, 233 - struct device_attribute *attr, 234 - const char *buf, size_t len) 235 - { 236 - if (len < 1) 237 - return -1; 238 - switch (buf[0]) { 239 - case '1': 240 - case 'y': 241 - case 'Y': 242 - return ade7759_reset(dev); 243 - } 244 - return -1; 245 - } 246 - 247 232 static IIO_DEV_ATTR_AENERGY(ade7759_read_40bit, ADE7759_AENERGY); 248 233 static IIO_DEV_ATTR_CFDEN(S_IWUSR | S_IRUGO, 249 234 ade7759_read_16bit, ··· 403 418 ade7759_read_frequency, 404 419 ade7759_write_frequency); 405 420 406 - static IIO_DEV_ATTR_RESET(ade7759_write_reset); 407 - 408 421 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("27900 14000 7000 3500"); 409 422 410 423 static struct attribute *ade7759_attributes[] = { ··· 411 428 &iio_const_attr_in_temp_scale.dev_attr.attr, 412 429 &iio_dev_attr_sampling_frequency.dev_attr.attr, 413 430 &iio_const_attr_sampling_frequency_available.dev_attr.attr, 414 - &iio_dev_attr_reset.dev_attr.attr, 415 431 &iio_dev_attr_phcal.dev_attr.attr, 416 432 &iio_dev_attr_cfden.dev_attr.attr, 417 433 &iio_dev_attr_aenergy.dev_attr.attr,
-19
drivers/staging/iio/meter/ade7854.c
··· 186 186 return st->write_reg_16(dev, ADE7854_CONFIG, val); 187 187 } 188 188 189 - 190 - static ssize_t ade7854_write_reset(struct device *dev, 191 - struct device_attribute *attr, 192 - const char *buf, size_t len) 193 - { 194 - if (len < 1) 195 - return -1; 196 - switch (buf[0]) { 197 - case '1': 198 - case 'y': 199 - case 'Y': 200 - return ade7854_reset(dev); 201 - } 202 - return -1; 203 - } 204 - 205 189 static IIO_DEV_ATTR_AIGAIN(S_IWUSR | S_IRUGO, 206 190 ade7854_read_24bit, 207 191 ade7854_write_24bit, ··· 452 468 return ret; 453 469 } 454 470 455 - static IIO_DEV_ATTR_RESET(ade7854_write_reset); 456 - 457 471 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("8000"); 458 472 459 473 static IIO_CONST_ATTR(name, "ade7854"); ··· 497 515 &iio_dev_attr_bvahr.dev_attr.attr, 498 516 &iio_dev_attr_cvahr.dev_attr.attr, 499 517 &iio_const_attr_sampling_frequency_available.dev_attr.attr, 500 - &iio_dev_attr_reset.dev_attr.attr, 501 518 &iio_const_attr_name.dev_attr.attr, 502 519 &iio_dev_attr_vpeak.dev_attr.attr, 503 520 &iio_dev_attr_ipeak.dev_attr.attr,