change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/iio/imu/adis_trigger.c
..
..
@@ -1,10 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Common library for ADIS16XXX devices
3
4
  *
4
5
  * Copyright 2012 Analog Devices Inc.
5
6
  *   Author: Lars-Peter Clausen <lars@metafoo.de>
6
- *
7
- * Licensed under the GPL-2 or later.
8
7
  */
9
8
 
10
9
 #include <linux/interrupt.h>
..
..
@@ -16,8 +15,7 @@
16
15
 #include <linux/iio/trigger.h>
17
16
 #include <linux/iio/imu/adis.h>
18
17
 
19
-static int adis_data_rdy_trigger_set_state(struct iio_trigger *trig,
20
-						bool state)
18
+static int adis_data_rdy_trigger_set_state(struct iio_trigger *trig, bool state)
21
19
 {
22
20
 	struct adis *adis = iio_trigger_get_drvdata(trig);
23
21
 
..
..
@@ -28,62 +26,71 @@
28
26
 	.set_trigger_state = &adis_data_rdy_trigger_set_state,
29
27
 };
30
28
 
29
+static void adis_trigger_setup(struct adis *adis)
30
+{
31
+	adis->trig->dev.parent = &adis->spi->dev;
32
+	adis->trig->ops = &adis_trigger_ops;
33
+	iio_trigger_set_drvdata(adis->trig, adis);
34
+}
35
+
36
+static int adis_validate_irq_flag(struct adis *adis)
37
+{
38
+	unsigned long direction = adis->irq_flag & IRQF_TRIGGER_MASK;
39
+
40
+	/* We cannot mask the interrupt so ensure it's not enabled at request */
41
+	if (adis->data->unmasked_drdy)
42
+		adis->irq_flag |= IRQF_NO_AUTOEN;
43
+	/*
44
+	 * Typically this devices have data ready either on the rising edge or
45
+	 * on the falling edge of the data ready pin. This checks enforces that
46
+	 * one of those is set in the drivers... It defaults to
47
+	 * IRQF_TRIGGER_RISING for backward compatibility with devices that
48
+	 * don't support changing the pin polarity.
49
+	 */
50
+	if (direction == IRQF_TRIGGER_NONE) {
51
+		adis->irq_flag |= IRQF_TRIGGER_RISING;
52
+		return 0;
53
+	} else if (direction != IRQF_TRIGGER_RISING &&
54
+		   direction != IRQF_TRIGGER_FALLING) {
55
+		dev_err(&adis->spi->dev, "Invalid IRQ mask: %08lx\n",
56
+			adis->irq_flag);
57
+		return -EINVAL;
58
+	}
59
+
60
+	return 0;
61
+}
62
+
31
63
 /**
32
- * adis_probe_trigger() - Sets up trigger for a adis device
64
+ * devm_adis_probe_trigger() - Sets up trigger for a managed adis device
33
65
  * @adis: The adis device
34
66
  * @indio_dev: The IIO device
35
67
  *
36
68
  * Returns 0 on success or a negative error code
37
- *
38
- * adis_remove_trigger() should be used to free the trigger.
39
69
  */
40
-int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev)
70
+int devm_adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev)
41
71
 {
42
72
 	int ret;
43
73
 
44
-	adis->trig = iio_trigger_alloc("%s-dev%d", indio_dev->name,
45
-					indio_dev->id);
46
-	if (adis->trig == NULL)
74
+	adis->trig = devm_iio_trigger_alloc(&adis->spi->dev, "%s-dev%d",
75
+					    indio_dev->name, indio_dev->id);
76
+	if (!adis->trig)
47
77
 		return -ENOMEM;
48
78
 
49
-	adis->trig->dev.parent = &adis->spi->dev;
50
-	adis->trig->ops = &adis_trigger_ops;
51
-	iio_trigger_set_drvdata(adis->trig, adis);
79
+	adis_trigger_setup(adis);
52
80
 
53
-	ret = request_irq(adis->spi->irq,
54
-			  &iio_trigger_generic_data_rdy_poll,
55
-			  IRQF_TRIGGER_RISING,
56
-			  indio_dev->name,
57
-			  adis->trig);
81
+	ret = adis_validate_irq_flag(adis);
58
82
 	if (ret)
59
-		goto error_free_trig;
83
+		return ret;
60
84
 
61
-	ret = iio_trigger_register(adis->trig);
62
-
63
-	indio_dev->trig = iio_trigger_get(adis->trig);
85
+	ret = devm_request_irq(&adis->spi->dev, adis->spi->irq,
86
+			       &iio_trigger_generic_data_rdy_poll,
87
+			       adis->irq_flag,
88
+			       indio_dev->name,
89
+			       adis->trig);
64
90
 	if (ret)
65
-		goto error_free_irq;
91
+		return ret;
66
92
 
67
-	return 0;
68
-
69
-error_free_irq:
70
-	free_irq(adis->spi->irq, adis->trig);
71
-error_free_trig:
72
-	iio_trigger_free(adis->trig);
73
-	return ret;
93
+	return devm_iio_trigger_register(&adis->spi->dev, adis->trig);
74
94
 }
75
-EXPORT_SYMBOL_GPL(adis_probe_trigger);
95
+EXPORT_SYMBOL_NS_GPL(devm_adis_probe_trigger, IIO_ADISLIB);
76
96
 
77
-/**
78
- * adis_remove_trigger() - Remove trigger for a adis devices
79
- * @adis: The adis device
80
- *
81
- * Removes the trigger previously registered with adis_probe_trigger().
82
- */
83
-void adis_remove_trigger(struct adis *adis)
84
-{
85
-	iio_trigger_unregister(adis->trig);
86
-	free_irq(adis->spi->irq, adis->trig);
87
-	iio_trigger_free(adis->trig);
88
-}
89
-EXPORT_SYMBOL_GPL(adis_remove_trigger);