diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-22 15:53:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-22 15:53:38 +0200 |
| commit | a65ce15718533bef7c128a3a8719cf8b6ffcfaaa (patch) | |
| tree | 714e05aee8ef995892bfe9d0e1fb9bb0c8c581d1 /drivers | |
| parent | ea40d7d8f8995e9d82586d7a04527f84ff354b6c (diff) | |
| parent | 39266b642ccdc154b48eae11263920956fa0e89e (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/counter/microchip-tcb-capture.c | 1 | ||||
| -rw-r--r-- | drivers/counter/rz-mtu3-cnt.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c index e2d1dc6ca668..975e431d1590 100644 --- a/drivers/counter/microchip-tcb-capture.c +++ b/drivers/counter/microchip-tcb-capture.c @@ -10,7 +10,6 @@ #include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <soc/at91/atmel_tcb.h> diff --git a/drivers/counter/rz-mtu3-cnt.c b/drivers/counter/rz-mtu3-cnt.c index 48c83933aa2f..ee821493b166 100644 --- a/drivers/counter/rz-mtu3-cnt.c +++ b/drivers/counter/rz-mtu3-cnt.c @@ -500,8 +500,8 @@ static int rz_mtu3_count_enable_write(struct counter_device *counter, int ret = 0; if (enable) { - pm_runtime_get_sync(ch->dev); mutex_lock(&priv->lock); + pm_runtime_get_sync(ch->dev); ret = rz_mtu3_initialize_counter(counter, count->id); if (ret == 0) priv->count_is_enabled[count->id] = true; @@ -510,8 +510,8 @@ static int rz_mtu3_count_enable_write(struct counter_device *counter, mutex_lock(&priv->lock); rz_mtu3_terminate_counter(counter, count->id); priv->count_is_enabled[count->id] = false; - mutex_unlock(&priv->lock); pm_runtime_put(ch->dev); + mutex_unlock(&priv->lock); } return ret; |