Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'counter-updates-for-6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-next
William writes:
Counter updates for 6.18
Includes a cleanup of the Counter subsystem sysfs attributes
documentation component_id list to alphabetical order, and replaces
superfluous error handling code in ecap_cnt_probe() with a call to
device-managed devm_pm_runtime_enable().
* tag 'counter-updates-for-6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
counter: ti-ecap-capture: Use devm_pm_runtime_enable()
counter: Alphabetize component_id sysfs attributes Documentation list
+6
-14
+4
-4
Documentation/ABI/testing/sysfs-bus-counter
+4
-4
Documentation/ABI/testing/sysfs-bus-counter
···
309
309
310
310
What: /sys/bus/counter/devices/counterX/cascade_counts_enable_component_id
311
311
What: /sys/bus/counter/devices/counterX/external_input_phase_clock_select_component_id
312
-
What: /sys/bus/counter/devices/counterX/countY/compare_component_id
313
312
What: /sys/bus/counter/devices/counterX/countY/capture_component_id
314
313
What: /sys/bus/counter/devices/counterX/countY/ceiling_component_id
315
-
What: /sys/bus/counter/devices/counterX/countY/floor_component_id
314
+
What: /sys/bus/counter/devices/counterX/countY/compare_component_id
316
315
What: /sys/bus/counter/devices/counterX/countY/count_mode_component_id
317
316
What: /sys/bus/counter/devices/counterX/countY/direction_component_id
318
317
What: /sys/bus/counter/devices/counterX/countY/enable_component_id
319
318
What: /sys/bus/counter/devices/counterX/countY/error_noise_component_id
319
+
What: /sys/bus/counter/devices/counterX/countY/floor_component_id
320
+
What: /sys/bus/counter/devices/counterX/countY/num_overflows_component_id
320
321
What: /sys/bus/counter/devices/counterX/countY/prescaler_component_id
321
322
What: /sys/bus/counter/devices/counterX/countY/preset_component_id
322
323
What: /sys/bus/counter/devices/counterX/countY/preset_enable_component_id
323
324
What: /sys/bus/counter/devices/counterX/countY/signalZ_action_component_id
324
-
What: /sys/bus/counter/devices/counterX/countY/num_overflows_component_id
325
325
What: /sys/bus/counter/devices/counterX/signalY/cable_fault_component_id
326
326
What: /sys/bus/counter/devices/counterX/signalY/cable_fault_enable_component_id
327
327
What: /sys/bus/counter/devices/counterX/signalY/filter_clock_prescaler_component_id
328
+
What: /sys/bus/counter/devices/counterX/signalY/frequency_component_id
328
329
What: /sys/bus/counter/devices/counterX/signalY/index_polarity_component_id
329
330
What: /sys/bus/counter/devices/counterX/signalY/polarity_component_id
330
331
What: /sys/bus/counter/devices/counterX/signalY/synchronous_mode_component_id
331
-
What: /sys/bus/counter/devices/counterX/signalY/frequency_component_id
332
332
KernelVersion: 5.16
333
333
Contact: linux-iio@vger.kernel.org
334
334
Description:
+2
-10
drivers/counter/ti-ecap-capture.c
+2
-10
drivers/counter/ti-ecap-capture.c
···
465
465
return IRQ_HANDLED;
466
466
}
467
467
468
-
static void ecap_cnt_pm_disable(void *dev)
469
-
{
470
-
pm_runtime_disable(dev);
471
-
}
472
-
473
468
static int ecap_cnt_probe(struct platform_device *pdev)
474
469
{
475
470
struct device *dev = &pdev->dev;
···
518
523
519
524
platform_set_drvdata(pdev, counter_dev);
520
525
521
-
pm_runtime_enable(dev);
522
-
523
-
/* Register a cleanup callback to care for disabling PM */
524
-
ret = devm_add_action_or_reset(dev, ecap_cnt_pm_disable, dev);
526
+
ret = devm_pm_runtime_enable(dev);
525
527
if (ret)
526
-
return dev_err_probe(dev, ret, "failed to add pm disable action\n");
528
+
return ret;
527
529
528
530
ret = devm_counter_add(dev, counter_dev);
529
531
if (ret)