summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sound/soc/intel/catpt/core.h2
-rw-r--r--sound/soc/intel/catpt/device.c4
-rw-r--r--sound/soc/intel/catpt/loader.c2
-rw-r--r--sound/soc/intel/catpt/pcm.c24
-rw-r--r--sound/soc/intel/catpt/sysfs.c2
5 files changed, 15 insertions, 19 deletions
diff --git a/sound/soc/intel/catpt/core.h b/sound/soc/intel/catpt/core.h
index 7b7c30a0d2ac..d273f24d3d53 100644
--- a/sound/soc/intel/catpt/core.h
+++ b/sound/soc/intel/catpt/core.h
@@ -129,7 +129,7 @@ irqreturn_t catpt_dsp_irq_thread(int irq, void *dev_id);
* HOST <-> DSP communication yet failure to process specific request.
* Use below macro to convert returned non-zero values appropriately
*/
-#define CATPT_IPC_ERROR(err) (((err) < 0) ? (err) : -EREMOTEIO)
+#define CATPT_IPC_RET(ret) (((ret) <= 0) ? (ret) : -EREMOTEIO)
int catpt_dsp_send_msg_timeout(struct catpt_dev *cdev,
struct catpt_ipc_msg request,
diff --git a/sound/soc/intel/catpt/device.c b/sound/soc/intel/catpt/device.c
index d13062c8e907..d8e0da558495 100644
--- a/sound/soc/intel/catpt/device.c
+++ b/sound/soc/intel/catpt/device.c
@@ -41,7 +41,7 @@ static int catpt_do_suspend(struct device *dev)
memset(&cdev->dx_ctx, 0, sizeof(cdev->dx_ctx));
ret = catpt_ipc_enter_dxstate(cdev, CATPT_DX_STATE_D3, &cdev->dx_ctx);
if (ret) {
- ret = CATPT_IPC_ERROR(ret);
+ ret = CATPT_IPC_RET(ret);
goto release_dma_chan;
}
@@ -107,7 +107,7 @@ static int catpt_resume(struct device *dev)
ret = catpt_ipc_set_device_format(cdev, &cdev->devfmt[i]);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
}
return 0;
diff --git a/sound/soc/intel/catpt/loader.c b/sound/soc/intel/catpt/loader.c
index f5705cd2c1e1..80c4ab335525 100644
--- a/sound/soc/intel/catpt/loader.c
+++ b/sound/soc/intel/catpt/loader.c
@@ -656,7 +656,7 @@ int catpt_first_boot_firmware(struct catpt_dev *cdev)
ret = catpt_ipc_get_mixer_stream_info(cdev, &cdev->mixer);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
ret = catpt_arm_stream_templates(cdev);
if (ret) {
diff --git a/sound/soc/intel/catpt/pcm.c b/sound/soc/intel/catpt/pcm.c
index abd1cb07c60c..cc43346f83af 100644
--- a/sound/soc/intel/catpt/pcm.c
+++ b/sound/soc/intel/catpt/pcm.c
@@ -365,9 +365,7 @@ static int catpt_dai_apply_usettings(struct snd_soc_dai *dai,
if (stream->template->type != CATPT_STRM_TYPE_LOOPBACK)
return catpt_set_dspvol(cdev, id, (long *)pos->private_value);
ret = catpt_ipc_mute_loopback(cdev, id, *(bool *)pos->private_value);
- if (ret)
- return CATPT_IPC_ERROR(ret);
- return 0;
+ return CATPT_IPC_RET(ret);
}
static int catpt_dai_hw_params(struct snd_pcm_substream *substream,
@@ -414,7 +412,7 @@ static int catpt_dai_hw_params(struct snd_pcm_substream *substream,
cdev->scratch,
&stream->info);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
ret = catpt_dai_apply_usettings(dai, stream);
if (ret) {
@@ -456,11 +454,11 @@ static int catpt_dai_prepare(struct snd_pcm_substream *substream,
ret = catpt_ipc_reset_stream(cdev, stream->info.stream_hw_id);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
ret = catpt_ipc_pause_stream(cdev, stream->info.stream_hw_id);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
stream->prepared = true;
return 0;
@@ -491,7 +489,7 @@ static int catpt_dai_trigger(struct snd_pcm_substream *substream, int cmd,
ret = catpt_ipc_set_write_pos(cdev, stream->info.stream_hw_id,
pos, false, false);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
fallthrough;
case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
@@ -499,7 +497,7 @@ static int catpt_dai_trigger(struct snd_pcm_substream *substream, int cmd,
catpt_dsp_update_lpclock(cdev);
ret = catpt_ipc_resume_stream(cdev, stream->info.stream_hw_id);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
break;
case SNDRV_PCM_TRIGGER_STOP:
@@ -510,7 +508,7 @@ static int catpt_dai_trigger(struct snd_pcm_substream *substream, int cmd,
ret = catpt_ipc_pause_stream(cdev, stream->info.stream_hw_id);
catpt_dsp_update_lpclock(cdev);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
break;
default:
@@ -679,7 +677,7 @@ static int catpt_dai_pcm_new(struct snd_soc_pcm_runtime *rtm,
pm_runtime_put_autosuspend(cdev->dev);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
/* store device format set for given SSP */
memcpy(&cdev->devfmt[devfmt.iface], &devfmt, sizeof(devfmt));
@@ -849,9 +847,7 @@ static int catpt_set_dspvol(struct catpt_dev *cdev, u8 stream_id, long *ctlvol)
}
}
- if (ret)
- return CATPT_IPC_ERROR(ret);
- return 0;
+ return CATPT_IPC_RET(ret);
}
static int catpt_volume_info(struct snd_kcontrol *kcontrol,
@@ -1041,7 +1037,7 @@ static int catpt_loopback_switch_put(struct snd_kcontrol *kcontrol,
pm_runtime_put_autosuspend(cdev->dev);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
*(bool *)kcontrol->private_value = mute;
return 0;
diff --git a/sound/soc/intel/catpt/sysfs.c b/sound/soc/intel/catpt/sysfs.c
index e961e172f9b7..0cb122a4dfd2 100644
--- a/sound/soc/intel/catpt/sysfs.c
+++ b/sound/soc/intel/catpt/sysfs.c
@@ -24,7 +24,7 @@ static ssize_t fw_version_show(struct device *dev,
pm_runtime_put_autosuspend(cdev->dev);
if (ret)
- return CATPT_IPC_ERROR(ret);
+ return CATPT_IPC_RET(ret);
return sysfs_emit(buf, "%d.%d.%d.%d\n", version.type, version.major,
version.minor, version.build);
generated by cgit v1.2.3 (git 2.0.4) at 2026-02-27 22:37:50 +0000