mirror of
https://github.com/torvalds/linux.git
synced 2026-10-11 12:58:02 +02:00
ASoC: codecs: rt5677: Use guard() for mutex locks
Clean up the code using guard() for mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc <phucduc.bui@gmail.com> Link: https://patch.msgid.link/20260721102600.523199-22-phucduc.bui@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
bui duc phuc
Mark Brown
parent
c745a4e595
commit
be03bd5c4c
|
|
@ -6,6 +6,7 @@
|
|||
* Author: Oder Chiou <oder_chiou@realtek.com>
|
||||
*/
|
||||
|
||||
#include <linux/cleanup.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/spi/spi.h>
|
||||
|
|
@ -133,9 +134,8 @@ static int rt5677_spi_hw_params(
|
|||
struct rt5677_dsp *rt5677_dsp =
|
||||
snd_soc_component_get_drvdata(component);
|
||||
|
||||
mutex_lock(&rt5677_dsp->dma_lock);
|
||||
guard(mutex)(&rt5677_dsp->dma_lock);
|
||||
rt5677_dsp->substream = substream;
|
||||
mutex_unlock(&rt5677_dsp->dma_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -147,9 +147,8 @@ static int rt5677_spi_hw_free(
|
|||
struct rt5677_dsp *rt5677_dsp =
|
||||
snd_soc_component_get_drvdata(component);
|
||||
|
||||
mutex_lock(&rt5677_dsp->dma_lock);
|
||||
guard(mutex)(&rt5677_dsp->dma_lock);
|
||||
rt5677_dsp->substream = NULL;
|
||||
mutex_unlock(&rt5677_dsp->dma_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -311,17 +310,17 @@ static void rt5677_spi_copy_work(struct work_struct *work)
|
|||
int ret = 0;
|
||||
|
||||
/* Ensure runtime->dma_area buffer does not go away while copying. */
|
||||
mutex_lock(&rt5677_dsp->dma_lock);
|
||||
guard(mutex)(&rt5677_dsp->dma_lock);
|
||||
if (!rt5677_dsp->substream) {
|
||||
dev_err(rt5677_dsp->dev, "No pcm substream\n");
|
||||
goto done;
|
||||
return;
|
||||
}
|
||||
|
||||
runtime = rt5677_dsp->substream->runtime;
|
||||
|
||||
if (rt5677_spi_mic_write_offset(&mic_write_offset)) {
|
||||
dev_err(rt5677_dsp->dev, "No mic_write_offset\n");
|
||||
goto done;
|
||||
return;
|
||||
}
|
||||
|
||||
/* If this is the first time that we've asked for streaming data after
|
||||
|
|
@ -355,7 +354,7 @@ static void rt5677_spi_copy_work(struct work_struct *work)
|
|||
ret = rt5677_spi_copy(rt5677_dsp, copy_bytes);
|
||||
if (ret) {
|
||||
dev_err(rt5677_dsp->dev, "Copy failed %d\n", ret);
|
||||
goto done;
|
||||
return;
|
||||
}
|
||||
rt5677_dsp->avail_bytes += copy_bytes;
|
||||
if (rt5677_dsp->avail_bytes >= period_bytes) {
|
||||
|
|
@ -367,8 +366,6 @@ static void rt5677_spi_copy_work(struct work_struct *work)
|
|||
|
||||
delay = bytes_to_frames(runtime, period_bytes) / runtime->rate;
|
||||
schedule_delayed_work(&rt5677_dsp->copy_work, secs_to_jiffies(delay));
|
||||
done:
|
||||
mutex_unlock(&rt5677_dsp->dma_lock);
|
||||
}
|
||||
|
||||
static int rt5677_spi_pcm_new(struct snd_soc_component *component,
|
||||
|
|
@ -507,10 +504,8 @@ int rt5677_spi_read(u32 addr, void *rxbuf, size_t len)
|
|||
header[3] = ((addr + offset) & 0x0000ff00) >> 8;
|
||||
header[4] = ((addr + offset) & 0x000000ff) >> 0;
|
||||
|
||||
mutex_lock(&spi_mutex);
|
||||
status |= spi_sync(g_spi, &m);
|
||||
mutex_unlock(&spi_mutex);
|
||||
|
||||
scoped_guard(mutex, &spi_mutex)
|
||||
status |= spi_sync(g_spi, &m);
|
||||
|
||||
/* Copy data back to caller buffer */
|
||||
rt5677_spi_reverse(cb + offset, len - offset, body, t[1].len);
|
||||
|
|
@ -564,9 +559,8 @@ int rt5677_spi_write(u32 addr, const void *txbuf, size_t len)
|
|||
offset += t.len;
|
||||
t.len += RT5677_SPI_HEADER + 1;
|
||||
|
||||
mutex_lock(&spi_mutex);
|
||||
status |= spi_sync(g_spi, &m);
|
||||
mutex_unlock(&spi_mutex);
|
||||
scoped_guard(mutex, &spi_mutex)
|
||||
status |= spi_sync(g_spi, &m);
|
||||
}
|
||||
return status;
|
||||
}
|
||||
|
|
@ -591,10 +585,10 @@ void rt5677_spi_hotword_detected(void)
|
|||
return;
|
||||
}
|
||||
|
||||
mutex_lock(&rt5677_dsp->dma_lock);
|
||||
dev_info(rt5677_dsp->dev, "Hotword detected\n");
|
||||
rt5677_dsp->new_hotword = true;
|
||||
mutex_unlock(&rt5677_dsp->dma_lock);
|
||||
scoped_guard(mutex, &rt5677_dsp->dma_lock) {
|
||||
dev_info(rt5677_dsp->dev, "Hotword detected\n");
|
||||
rt5677_dsp->new_hotword = true;
|
||||
}
|
||||
|
||||
schedule_delayed_work(&rt5677_dsp->copy_work, 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
* Author: Oder Chiou <oder_chiou@realtek.com>
|
||||
*/
|
||||
|
||||
#include <linux/cleanup.h>
|
||||
#include <linux/bits.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/firmware.h>
|
||||
|
|
@ -564,46 +565,43 @@ static int rt5677_dsp_mode_i2c_write_addr(struct rt5677_priv *rt5677,
|
|||
struct snd_soc_component *component = rt5677->component;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&rt5677->dsp_cmd_lock);
|
||||
guard(mutex)(&rt5677->dsp_cmd_lock);
|
||||
|
||||
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_MSB,
|
||||
addr >> 16);
|
||||
if (ret < 0) {
|
||||
dev_err(component->dev, "Failed to set addr msb value: %d\n", ret);
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_LSB,
|
||||
addr & 0xffff);
|
||||
if (ret < 0) {
|
||||
dev_err(component->dev, "Failed to set addr lsb value: %d\n", ret);
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_MSB,
|
||||
value >> 16);
|
||||
if (ret < 0) {
|
||||
dev_err(component->dev, "Failed to set data msb value: %d\n", ret);
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_LSB,
|
||||
value & 0xffff);
|
||||
if (ret < 0) {
|
||||
dev_err(component->dev, "Failed to set data lsb value: %d\n", ret);
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_OP_CODE,
|
||||
opcode);
|
||||
if (ret < 0) {
|
||||
dev_err(component->dev, "Failed to set op code value: %d\n", ret);
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
err:
|
||||
mutex_unlock(&rt5677->dsp_cmd_lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -623,36 +621,33 @@ static int rt5677_dsp_mode_i2c_read_addr(
|
|||
int ret;
|
||||
unsigned int msb, lsb;
|
||||
|
||||
mutex_lock(&rt5677->dsp_cmd_lock);
|
||||
guard(mutex)(&rt5677->dsp_cmd_lock);
|
||||
|
||||
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_MSB,
|
||||
addr >> 16);
|
||||
if (ret < 0) {
|
||||
dev_err(component->dev, "Failed to set addr msb value: %d\n", ret);
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_LSB,
|
||||
addr & 0xffff);
|
||||
if (ret < 0) {
|
||||
dev_err(component->dev, "Failed to set addr lsb value: %d\n", ret);
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_OP_CODE,
|
||||
0x0002);
|
||||
if (ret < 0) {
|
||||
dev_err(component->dev, "Failed to set op code value: %d\n", ret);
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
regmap_read(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_MSB, &msb);
|
||||
regmap_read(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_LSB, &lsb);
|
||||
*value = (msb << 16) | lsb;
|
||||
|
||||
err:
|
||||
mutex_unlock(&rt5677->dsp_cmd_lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -941,21 +936,20 @@ static void rt5677_dsp_work(struct work_struct *work)
|
|||
activity = false;
|
||||
|
||||
/* Don't turn off the DSP while handling irqs */
|
||||
mutex_lock(&rt5677->irq_lock);
|
||||
/* Set DSP CPU to Stop */
|
||||
regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1,
|
||||
RT5677_PWR_DSP_CPU, RT5677_PWR_DSP_CPU);
|
||||
scoped_guard(mutex, &rt5677->irq_lock) {
|
||||
/* Set DSP CPU to Stop */
|
||||
regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1,
|
||||
RT5677_PWR_DSP_CPU, RT5677_PWR_DSP_CPU);
|
||||
|
||||
rt5677_set_dsp_mode(rt5677, false);
|
||||
rt5677_set_dsp_mode(rt5677, false);
|
||||
|
||||
/* Disable and clear VAD interrupt */
|
||||
regmap_write(rt5677->regmap, RT5677_VAD_CTRL1, 0x2184);
|
||||
/* Disable and clear VAD interrupt */
|
||||
regmap_write(rt5677->regmap, RT5677_VAD_CTRL1, 0x2184);
|
||||
|
||||
/* Set GPIO1 pin back to be IRQ output for jack detect */
|
||||
regmap_update_bits(rt5677->regmap, RT5677_GPIO_CTRL1,
|
||||
RT5677_GPIO1_PIN_MASK, RT5677_GPIO1_PIN_IRQ);
|
||||
|
||||
mutex_unlock(&rt5677->irq_lock);
|
||||
/* Set GPIO1 pin back to be IRQ output for jack detect */
|
||||
regmap_update_bits(rt5677->regmap, RT5677_GPIO_CTRL1,
|
||||
RT5677_GPIO1_PIN_MASK, RT5677_GPIO1_PIN_IRQ);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -4997,11 +4991,11 @@ static int rt5677_read(void *context, unsigned int reg, unsigned int *val)
|
|||
|
||||
if (rt5677->is_dsp_mode) {
|
||||
if (reg > 0xff) {
|
||||
mutex_lock(&rt5677->dsp_pri_lock);
|
||||
rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_INDEX,
|
||||
reg & 0xff);
|
||||
rt5677_dsp_mode_i2c_read(rt5677, RT5677_PRIV_DATA, val);
|
||||
mutex_unlock(&rt5677->dsp_pri_lock);
|
||||
scoped_guard(mutex, &rt5677->dsp_pri_lock) {
|
||||
rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_INDEX,
|
||||
reg & 0xff);
|
||||
rt5677_dsp_mode_i2c_read(rt5677, RT5677_PRIV_DATA, val);
|
||||
}
|
||||
} else {
|
||||
rt5677_dsp_mode_i2c_read(rt5677, reg, val);
|
||||
}
|
||||
|
|
@ -5019,12 +5013,12 @@ static int rt5677_write(void *context, unsigned int reg, unsigned int val)
|
|||
|
||||
if (rt5677->is_dsp_mode) {
|
||||
if (reg > 0xff) {
|
||||
mutex_lock(&rt5677->dsp_pri_lock);
|
||||
rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_INDEX,
|
||||
reg & 0xff);
|
||||
rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_DATA,
|
||||
val);
|
||||
mutex_unlock(&rt5677->dsp_pri_lock);
|
||||
scoped_guard(mutex, &rt5677->dsp_pri_lock) {
|
||||
rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_INDEX,
|
||||
reg & 0xff);
|
||||
rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_DATA,
|
||||
val);
|
||||
}
|
||||
} else {
|
||||
rt5677_dsp_mode_i2c_write(rt5677, reg, val);
|
||||
}
|
||||
|
|
@ -5416,7 +5410,7 @@ static void rt5677_resume_irq_check(struct work_struct *work)
|
|||
* Without this explicit check, unplug the headset right after suspend
|
||||
* starts, then after resume the headset is still shown as plugged in.
|
||||
*/
|
||||
mutex_lock(&rt5677->irq_lock);
|
||||
guard(mutex)(&rt5677->irq_lock);
|
||||
for (i = 0; i < RT5677_IRQ_NUM; i++) {
|
||||
if (rt5677->irq_en & rt5677_irq_descs[i].enable_mask) {
|
||||
virq = irq_find_mapping(rt5677->domain, i);
|
||||
|
|
@ -5424,7 +5418,6 @@ static void rt5677_resume_irq_check(struct work_struct *work)
|
|||
handle_nested_irq(virq);
|
||||
}
|
||||
}
|
||||
mutex_unlock(&rt5677->irq_lock);
|
||||
}
|
||||
|
||||
static void rt5677_irq_bus_lock(struct irq_data *data)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user