tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'counter-updates-for-6.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-next

William writes:

First set of Counter updates for the 6.6 cycle

This set consists primarily of minor clean-ups. The counter_priv()
'const' attribute change does yield a small improvement in reducing
the binary size.

Changes
* rz-mtu3-cnt
- Reorder locking sequence for consistency
* Documentation
- sysfs-bus-counter: Fix indentation
* counter
- Declare counter_priv() to be const
* microchip-tcb-capture
- Explicitly include correct DT includes

* tag 'counter-updates-for-6.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
counter: rz-mtu3-cnt: Reorder locking sequence for consistency
Documentation: ABI: sysfs-bus-counter: Fix indentation
counter: Declare counter_priv() to be const
counter: Explicitly include correct DT includes

Greg Kroah-Hartman a65ce157 ea40d7d8

+7 -8
+4 -4
Documentation/ABI/testing/sysfs-bus-counter
··· 22 22 phase clock. 23 23 24 24 What: /sys/bus/counter/devices/counterX/external_input_phase_clock_select_available 25 - KernelVersion: 6.4 26 - Contact: linux-iio@vger.kernel.org 25 + KernelVersion: 6.4 26 + Contact: linux-iio@vger.kernel.org 27 27 Description: 28 - Discrete set of available values for the respective device 29 - configuration are listed in this file. 28 + Discrete set of available values for the respective device 29 + configuration are listed in this file. 30 30 31 31 What: /sys/bus/counter/devices/counterX/countY/count 32 32 KernelVersion: 5.2
-1
drivers/counter/microchip-tcb-capture.c
··· 10 10 #include <linux/module.h> 11 11 #include <linux/mutex.h> 12 12 #include <linux/of.h> 13 - #include <linux/of_device.h> 14 13 #include <linux/platform_device.h> 15 14 #include <linux/regmap.h> 16 15 #include <soc/at91/atmel_tcb.h>
+2 -2
drivers/counter/rz-mtu3-cnt.c
··· 500 500 int ret = 0; 501 501 502 502 if (enable) { 503 - pm_runtime_get_sync(ch->dev); 504 503 mutex_lock(&priv->lock); 504 + pm_runtime_get_sync(ch->dev); 505 505 ret = rz_mtu3_initialize_counter(counter, count->id); 506 506 if (ret == 0) 507 507 priv->count_is_enabled[count->id] = true; ··· 510 510 mutex_lock(&priv->lock); 511 511 rz_mtu3_terminate_counter(counter, count->id); 512 512 priv->count_is_enabled[count->id] = false; 513 - mutex_unlock(&priv->lock); 514 513 pm_runtime_put(ch->dev); 514 + mutex_unlock(&priv->lock); 515 515 } 516 516 517 517 return ret;
+1 -1
include/linux/counter.h
··· 399 399 struct mutex ops_exist_lock; 400 400 }; 401 401 402 - void *counter_priv(const struct counter_device *const counter); 402 + void *counter_priv(const struct counter_device *const counter) __attribute_const__; 403 403 404 404 struct counter_device *counter_alloc(size_t sizeof_priv); 405 405 void counter_put(struct counter_device *const counter);