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

iio: adc: ad_sigma_delta: remove ad_sd_{setup,cleanup}_buffer_and_trigger()

Since all AD Sigma-Delta drivers now use the
devm_ad_sd_setup_buffer_and_trigger() function, we can remove the old
ad_sd_{setup,cleanup}_buffer_and_trigger() functions.

This way we can discourage new drivers that use the ad_sigma_delta
lib-driver to use these (older functions).

Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210513120752.90074-13-aardelean@deviqon.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Alexandru Ardelean and committed by
Jonathan Cameron
4b36151d c066ca14

-89
-86
drivers/iio/adc/ad_sigma_delta.c
··· 470 470 static const struct iio_trigger_ops ad_sd_trigger_ops = { 471 471 }; 472 472 473 - static int ad_sd_probe_trigger(struct iio_dev *indio_dev) 474 - { 475 - struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev); 476 - int ret; 477 - 478 - sigma_delta->trig = iio_trigger_alloc(&sigma_delta->spi->dev, 479 - "%s-dev%d", indio_dev->name, 480 - iio_device_id(indio_dev)); 481 - if (sigma_delta->trig == NULL) { 482 - ret = -ENOMEM; 483 - goto error_ret; 484 - } 485 - sigma_delta->trig->ops = &ad_sd_trigger_ops; 486 - init_completion(&sigma_delta->completion); 487 - 488 - sigma_delta->irq_dis = true; 489 - ret = request_irq(sigma_delta->spi->irq, 490 - ad_sd_data_rdy_trig_poll, 491 - sigma_delta->info->irq_flags | IRQF_NO_AUTOEN, 492 - indio_dev->name, 493 - sigma_delta); 494 - if (ret) 495 - goto error_free_trig; 496 - 497 - iio_trigger_set_drvdata(sigma_delta->trig, sigma_delta); 498 - 499 - ret = iio_trigger_register(sigma_delta->trig); 500 - if (ret) 501 - goto error_free_irq; 502 - 503 - /* select default trigger */ 504 - indio_dev->trig = iio_trigger_get(sigma_delta->trig); 505 - 506 - return 0; 507 - 508 - error_free_irq: 509 - free_irq(sigma_delta->spi->irq, sigma_delta); 510 - error_free_trig: 511 - iio_trigger_free(sigma_delta->trig); 512 - error_ret: 513 - return ret; 514 - } 515 - 516 473 static int devm_ad_sd_probe_trigger(struct device *dev, struct iio_dev *indio_dev) 517 474 { 518 475 struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev); ··· 509 552 510 553 return 0; 511 554 } 512 - 513 - static void ad_sd_remove_trigger(struct iio_dev *indio_dev) 514 - { 515 - struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev); 516 - 517 - iio_trigger_unregister(sigma_delta->trig); 518 - free_irq(sigma_delta->spi->irq, sigma_delta); 519 - iio_trigger_free(sigma_delta->trig); 520 - } 521 - 522 - /** 523 - * ad_sd_setup_buffer_and_trigger() - 524 - * @indio_dev: The IIO device 525 - */ 526 - int ad_sd_setup_buffer_and_trigger(struct iio_dev *indio_dev) 527 - { 528 - int ret; 529 - 530 - ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time, 531 - &ad_sd_trigger_handler, &ad_sd_buffer_setup_ops); 532 - if (ret) 533 - return ret; 534 - 535 - ret = ad_sd_probe_trigger(indio_dev); 536 - if (ret) { 537 - iio_triggered_buffer_cleanup(indio_dev); 538 - return ret; 539 - } 540 - 541 - return 0; 542 - } 543 - EXPORT_SYMBOL_GPL(ad_sd_setup_buffer_and_trigger); 544 - 545 - /** 546 - * ad_sd_cleanup_buffer_and_trigger() - 547 - * @indio_dev: The IIO device 548 - */ 549 - void ad_sd_cleanup_buffer_and_trigger(struct iio_dev *indio_dev) 550 - { 551 - ad_sd_remove_trigger(indio_dev); 552 - iio_triggered_buffer_cleanup(indio_dev); 553 - } 554 - EXPORT_SYMBOL_GPL(ad_sd_cleanup_buffer_and_trigger); 555 555 556 556 /** 557 557 * devm_ad_sd_setup_buffer_and_trigger() - Device-managed buffer & trigger setup
-3
include/linux/iio/adc/ad_sigma_delta.h
··· 133 133 int ad_sd_init(struct ad_sigma_delta *sigma_delta, struct iio_dev *indio_dev, 134 134 struct spi_device *spi, const struct ad_sigma_delta_info *info); 135 135 136 - int ad_sd_setup_buffer_and_trigger(struct iio_dev *indio_dev); 137 - void ad_sd_cleanup_buffer_and_trigger(struct iio_dev *indio_dev); 138 - 139 136 int devm_ad_sd_setup_buffer_and_trigger(struct device *dev, struct iio_dev *indio_dev); 140 137 141 138 int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig);