mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/iio/gyro/st_gyro_buffer.c
..
..
@@ -1,11 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * STMicroelectronics gyroscopes driver
3
4
  *
4
5
  * Copyright 2012-2013 STMicroelectronics Inc.
5
6
  *
6
7
  * Denis Ciocca <denis.ciocca@st.com>
7
- *
8
- * Licensed under the GPL-2.
9
8
  */
10
9
 
11
10
 #include <linux/module.h>
..
..
@@ -30,61 +29,37 @@
30
29
 	return st_sensors_set_dataready_irq(indio_dev, state);
31
30
 }
32
31
 
33
-static int st_gyro_buffer_preenable(struct iio_dev *indio_dev)
34
-{
35
-	return st_sensors_set_enable(indio_dev, true);
36
-}
37
-
38
32
 static int st_gyro_buffer_postenable(struct iio_dev *indio_dev)
39
33
 {
40
34
 	int err;
41
-	struct st_sensor_data *gdata = iio_priv(indio_dev);
42
35
 
43
-	gdata->buffer_data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
44
-	if (gdata->buffer_data == NULL) {
45
-		err = -ENOMEM;
46
-		goto allocate_memory_error;
47
-	}
48
-
49
-	err = st_sensors_set_axis_enable(indio_dev,
50
-					(u8)indio_dev->active_scan_mask[0]);
36
+	err = st_sensors_set_axis_enable(indio_dev, indio_dev->active_scan_mask[0]);
51
37
 	if (err < 0)
52
-		goto st_gyro_buffer_postenable_error;
38
+		return err;
53
39
 
54
-	err = iio_triggered_buffer_postenable(indio_dev);
40
+	err = st_sensors_set_enable(indio_dev, true);
55
41
 	if (err < 0)
56
-		goto st_gyro_buffer_postenable_error;
42
+		goto st_gyro_buffer_enable_all_axis;
57
43
 
58
-	return err;
44
+	return 0;
59
45
 
60
-st_gyro_buffer_postenable_error:
61
-	kfree(gdata->buffer_data);
62
-allocate_memory_error:
46
+st_gyro_buffer_enable_all_axis:
47
+	st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS);
63
48
 	return err;
64
49
 }
65
50
 
66
51
 static int st_gyro_buffer_predisable(struct iio_dev *indio_dev)
67
52
 {
68
53
 	int err;
69
-	struct st_sensor_data *gdata = iio_priv(indio_dev);
70
-
71
-	err = iio_triggered_buffer_predisable(indio_dev);
72
-	if (err < 0)
73
-		goto st_gyro_buffer_predisable_error;
74
-
75
-	err = st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS);
76
-	if (err < 0)
77
-		goto st_gyro_buffer_predisable_error;
78
54
 
79
55
 	err = st_sensors_set_enable(indio_dev, false);
56
+	if (err < 0)
57
+		return err;
80
58
 
81
-st_gyro_buffer_predisable_error:
82
-	kfree(gdata->buffer_data);
83
-	return err;
59
+	return st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS);
84
60
 }
85
61
 
86
62
 static const struct iio_buffer_setup_ops st_gyro_buffer_setup_ops = {
87
-	.preenable = &st_gyro_buffer_preenable,
88
63
 	.postenable = &st_gyro_buffer_postenable,
89
64
 	.predisable = &st_gyro_buffer_predisable,
90
65
 };