forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c
kernel/drivers/iio/adc/dln2-adc.c
....@@ -1,11 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Driver for the Diolan DLN-2 USB-ADC adapter
34 *
45 * Copyright (c) 2017 Jack Andersen
5
- *
6
- * This program is free software; you can redistribute it and/or
7
- * modify it under the terms of the GNU General Public License as
8
- * published by the Free Software Foundation, version 2.
96 */
107
118 #include <linux/kernel.h>
....@@ -526,10 +523,6 @@
526523 u16 conflict;
527524 unsigned int trigger_chan;
528525
529
- ret = iio_triggered_buffer_postenable(indio_dev);
530
- if (ret)
531
- return ret;
532
-
533526 mutex_lock(&dln2->mutex);
534527
535528 /* Enable ADC */
....@@ -543,7 +536,6 @@
543536 (int)conflict);
544537 ret = -EBUSY;
545538 }
546
- iio_triggered_buffer_predisable(indio_dev);
547539 return ret;
548540 }
549541
....@@ -557,7 +549,6 @@
557549 mutex_unlock(&dln2->mutex);
558550 if (ret < 0) {
559551 dev_dbg(&dln2->pdev->dev, "Problem in %s\n", __func__);
560
- iio_triggered_buffer_predisable(indio_dev);
561552 return ret;
562553 }
563554 } else {
....@@ -570,7 +561,7 @@
570561
571562 static int dln2_adc_triggered_buffer_predisable(struct iio_dev *indio_dev)
572563 {
573
- int ret, ret2;
564
+ int ret;
574565 struct dln2_adc *dln2 = iio_priv(indio_dev);
575566
576567 mutex_lock(&dln2->mutex);
....@@ -587,10 +578,6 @@
587578 mutex_unlock(&dln2->mutex);
588579 if (ret < 0)
589580 dev_dbg(&dln2->pdev->dev, "Problem in %s\n", __func__);
590
-
591
- ret2 = iio_triggered_buffer_predisable(indio_dev);
592
- if (ret == 0)
593
- ret = ret2;
594581
595582 return ret;
596583 }
....@@ -654,7 +641,6 @@
654641 IIO_CHAN_SOFT_TIMESTAMP_ASSIGN(dln2->iio_channels[i], i);
655642
656643 indio_dev->name = DLN2_ADC_MOD_NAME;
657
- indio_dev->dev.parent = dev;
658644 indio_dev->info = &dln2_adc_info;
659645 indio_dev->modes = INDIO_DIRECT_MODE;
660646 indio_dev->channels = dln2->iio_channels;