Commit ef509269 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'counter-updates-for-6.18' of... 

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
parents e2258cfd 51548c36

Documentation/ABI/testing/sysfs-bus-counter

+4 −4
Original line number Diff line number Diff line
@@ -309,26 +309,26 @@ Description: 


What:		/sys/bus/counter/devices/counterX/cascade_counts_enable_component_id

What:		/sys/bus/counter/devices/counterX/external_input_phase_clock_select_component_id

What:		/sys/bus/counter/devices/counterX/countY/compare_component_id

What:		/sys/bus/counter/devices/counterX/countY/capture_component_id

What:		/sys/bus/counter/devices/counterX/countY/ceiling_component_id

What:		/sys/bus/counter/devices/counterX/countY/floor_component_id

What:		/sys/bus/counter/devices/counterX/countY/compare_component_id

What:		/sys/bus/counter/devices/counterX/countY/count_mode_component_id

What:		/sys/bus/counter/devices/counterX/countY/direction_component_id

What:		/sys/bus/counter/devices/counterX/countY/enable_component_id

What:		/sys/bus/counter/devices/counterX/countY/error_noise_component_id

What:		/sys/bus/counter/devices/counterX/countY/floor_component_id

What:		/sys/bus/counter/devices/counterX/countY/num_overflows_component_id

What:		/sys/bus/counter/devices/counterX/countY/prescaler_component_id

What:		/sys/bus/counter/devices/counterX/countY/preset_component_id

What:		/sys/bus/counter/devices/counterX/countY/preset_enable_component_id

What:		/sys/bus/counter/devices/counterX/countY/signalZ_action_component_id

What:		/sys/bus/counter/devices/counterX/countY/num_overflows_component_id

What:		/sys/bus/counter/devices/counterX/signalY/cable_fault_component_id

What:		/sys/bus/counter/devices/counterX/signalY/cable_fault_enable_component_id

What:		/sys/bus/counter/devices/counterX/signalY/filter_clock_prescaler_component_id

What:		/sys/bus/counter/devices/counterX/signalY/frequency_component_id

What:		/sys/bus/counter/devices/counterX/signalY/index_polarity_component_id

What:		/sys/bus/counter/devices/counterX/signalY/polarity_component_id

What:		/sys/bus/counter/devices/counterX/signalY/synchronous_mode_component_id

What:		/sys/bus/counter/devices/counterX/signalY/frequency_component_id

KernelVersion:	5.16

Contact:	linux-iio@vger.kernel.org

Description:

drivers/counter/ti-ecap-capture.c

+2 −10
Original line number Diff line number Diff line
@@ -465,11 +465,6 @@ static irqreturn_t ecap_cnt_isr(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static void ecap_cnt_pm_disable(void *dev)

{

	pm_runtime_disable(dev);

}



static int ecap_cnt_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -523,12 +518,9 @@ static int ecap_cnt_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, counter_dev);



	pm_runtime_enable(dev);



	/* Register a cleanup callback to care for disabling PM */

	ret = devm_add_action_or_reset(dev, ecap_cnt_pm_disable, dev);

	ret = devm_pm_runtime_enable(dev);

	if (ret)

		return dev_err_probe(dev, ret, "failed to add pm disable action\n");

		return ret;



	ret = devm_counter_add(dev, counter_dev);

	if (ret)