superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pwm: microchip-core: Drop driver local locking 

The pwm core already serializes .apply() and .get_state(), so the driver
local lock is always free and adds no protection.

Drop it.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/6d6ef0376ea0058b040eec3b257e324493a083f1.1750788649.git.u.kleine-koenig@baylibre.com
Signed-off-by: Uwe Kleine-König <ukleinek@kernel.org>
pull/1309/head
Uwe Kleine-König 2025-06-24 20:15:41 +02:00 committed by Uwe Kleine-König
parent 33d73bde06
commit 9470e7d11f
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/pwm/pwm-microchip-core.c
View File

@ -36,7 +36,6 @@
#include <linux/ktime.h> #include <linux/ktime.h>
#include <linux/math.h> #include <linux/math.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pwm.h> #include <linux/pwm.h>
@ -56,7 +55,6 @@
struct mchp_core_pwm_chip { struct mchp_core_pwm_chip {
struct clk *clk; struct clk *clk;
void __iomem *base; void __iomem *base;
struct mutex lock; /* protects the shared period */
ktime_t update_timestamp; ktime_t update_timestamp;
u32 sync_update_mask; u32 sync_update_mask;
u16 channel_enabled; u16 channel_enabled;
@ -360,17 +358,10 @@ static int mchp_core_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
const struct pwm_state *state) const struct pwm_state *state)
{ {
struct mchp_core_pwm_chip *mchp_core_pwm = to_mchp_core_pwm(chip); struct mchp_core_pwm_chip *mchp_core_pwm = to_mchp_core_pwm(chip);
int ret;
mutex_lock(&mchp_core_pwm->lock);
mchp_core_pwm_wait_for_sync_update(mchp_core_pwm, pwm->hwpwm); mchp_core_pwm_wait_for_sync_update(mchp_core_pwm, pwm->hwpwm);
ret = mchp_core_pwm_apply_locked(chip, pwm, state); return mchp_core_pwm_apply_locked(chip, pwm, state);
mutex_unlock(&mchp_core_pwm->lock);
return ret;
} }
static int mchp_core_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, static int mchp_core_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
@ -381,8 +372,6 @@ static int mchp_core_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm
u16 prescale, period_steps; u16 prescale, period_steps;
u8 duty_steps, posedge, negedge; u8 duty_steps, posedge, negedge;
mutex_lock(&mchp_core_pwm->lock);
mchp_core_pwm_wait_for_sync_update(mchp_core_pwm, pwm->hwpwm); mchp_core_pwm_wait_for_sync_update(mchp_core_pwm, pwm->hwpwm);
if (mchp_core_pwm->channel_enabled & (1 << pwm->hwpwm)) if (mchp_core_pwm->channel_enabled & (1 << pwm->hwpwm))
@ -415,8 +404,6 @@ static int mchp_core_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm
posedge = readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_POSEDGE(pwm->hwpwm)); posedge = readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_POSEDGE(pwm->hwpwm));
negedge = readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_NEGEDGE(pwm->hwpwm)); negedge = readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_NEGEDGE(pwm->hwpwm));
mutex_unlock(&mchp_core_pwm->lock);
if (negedge == posedge) { if (negedge == posedge) {
state->duty_cycle = state->period; state->duty_cycle = state->period;
state->period *= 2; state->period *= 2;
@ -469,8 +456,6 @@ static int mchp_core_pwm_probe(struct platform_device *pdev)
&mchp_core_pwm->sync_update_mask)) &mchp_core_pwm->sync_update_mask))
mchp_core_pwm->sync_update_mask = 0; mchp_core_pwm->sync_update_mask = 0;
mutex_init(&mchp_core_pwm->lock);
chip->ops = &mchp_core_pwm_ops; chip->ops = &mchp_core_pwm_ops;
mchp_core_pwm->channel_enabled = readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_EN(0)); mchp_core_pwm->channel_enabled = readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_EN(0));