Merge "ASoC: msm: Fix the usage of macro IS_ERR_VALUE" into msm-4.8
diff --git a/drivers/mfd/msm-cdc-supply.c b/drivers/mfd/msm-cdc-supply.c
index 36c58e0..9c7ebf7 100644
--- a/drivers/mfd/msm-cdc-supply.c
+++ b/drivers/mfd/msm-cdc-supply.c
@@ -386,19 +386,19 @@ int msm_cdc_get_power_supplies(struct device *dev,
}
static_sup_cnt = of_property_count_strings(dev->of_node,
static_prop_name);
- if (IS_ERR_VALUE(static_sup_cnt)) {
+ if (static_sup_cnt < 0) {
dev_err(dev, "%s: Failed to get static supplies(%d)\n",
__func__, static_sup_cnt);
rc = static_sup_cnt;
goto err_supply_cnt;
}
ond_sup_cnt = of_property_count_strings(dev->of_node, ond_prop_name);
- if (IS_ERR_VALUE(ond_sup_cnt))
+ if (ond_sup_cnt < 0)
ond_sup_cnt = 0;
cp_sup_cnt = of_property_count_strings(dev->of_node,
cp_prop_name);
- if (IS_ERR_VALUE(cp_sup_cnt))
+ if (cp_sup_cnt < 0)
cp_sup_cnt = 0;
num_supplies = static_sup_cnt + ond_sup_cnt + cp_sup_cnt;
diff --git a/drivers/soc/qcom/avtimer.c b/drivers/soc/qcom/avtimer.c
index 5482fbf..757cdb0 100644
--- a/drivers/soc/qcom/avtimer.c
+++ b/drivers/soc/qcom/avtimer.c
@@ -517,7 +517,7 @@ static int __init avtimer_init(void)
s32 rc;
rc = platform_driver_register(&dev_avtimer_driver);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
pr_err("%s: platform_driver_register failed\n", __func__);
goto error_platform_driver;
}
diff --git a/drivers/soc/qcom/qdsp6v2/audio_notifier.c b/drivers/soc/qcom/qdsp6v2/audio_notifier.c
index 9119e8b..a2b0f0e 100644
--- a/drivers/soc/qcom/qdsp6v2/audio_notifier.c
+++ b/drivers/soc/qcom/qdsp6v2/audio_notifier.c
@@ -224,7 +224,7 @@ static int audio_notifer_dereg_service(int service, int domain)
ret = -EINVAL;
goto done;
}
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
pr_err("%s: deregister failed for service %s, ret %d\n",
__func__, service_data[service][domain].name, ret);
goto done;
@@ -260,7 +260,7 @@ static int audio_notifer_reg_client_service(struct client_data *client_data,
goto done;
}
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
pr_err("%s: service registration failed on service %s for client %s\n",
__func__, service_data[service][domain].name,
client_data->client_name);
@@ -329,7 +329,7 @@ static int audio_notifer_reg_client(struct client_data *client_data)
service_data[service][domain].name);
ret = audio_notifer_reg_client_service(client_data, service);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
pr_err("%s: client %s failed to register on service %s",
__func__, client_data->client_name,
service_data[service][domain].name);
@@ -361,7 +361,7 @@ static int audio_notifer_dereg_client(struct client_data *client_data)
goto done;
}
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
pr_err("%s: deregister failed for client %s on service %s, ret %d\n",
__func__, client_data->client_name,
service_data[service][domain].name, ret);
@@ -370,7 +370,7 @@ static int audio_notifer_dereg_client(struct client_data *client_data)
ret = srcu_notifier_chain_unregister(&service_data[service][domain].
client_nb_list, client_data->nb);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
pr_err("%s: srcu_notifier_chain_unregister failed, ret %d\n",
__func__, ret);
goto done;
@@ -397,7 +397,7 @@ static void audio_notifer_reg_all_clients(void)
client_data = list_entry(ptr,
struct client_data, list);
ret = audio_notifer_reg_client(client_data);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
pr_err("%s: audio_notifer_reg_client failed for client %s, ret %d\n",
__func__, client_data->client_name,
ret);
@@ -468,7 +468,7 @@ static int audio_notifer_service_cb(unsigned long opcode,
service_data[service][domain].state = notifier_opcode;
ret = srcu_notifier_call_chain(&service_data[service][domain].
client_nb_list, notifier_opcode, &data);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
pr_err("%s: srcu_notifier_call_chain returned %d, service %s, opcode 0x%lx\n",
__func__, ret, service_data[service][domain].name,
notifier_opcode);
@@ -570,7 +570,7 @@ int audio_notifier_register(char *client_name, int domain,
mutex_lock(¬ifier_mutex);
ret = audio_notifer_reg_client(client_data);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
mutex_unlock(¬ifier_mutex);
pr_err("%s: audio_notifer_reg_client for client %s failed ret = %d\n",
__func__, client_data->client_name,
@@ -610,7 +610,7 @@ static int __init audio_notifier_init(void)
int ret;
ret = audio_pdr_register(&pdr_nb);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
pr_debug("%s: PDR register failed, ret = %d, disable service\n",
__func__, ret);
audio_notifer_disable_service(AUDIO_NOTIFIER_PDR_SERVICE);
diff --git a/drivers/soc/qcom/qdsp6v2/audio_pdr.c b/drivers/soc/qcom/qdsp6v2/audio_pdr.c
index 0270e1f..449d19a 100644
--- a/drivers/soc/qcom/qdsp6v2/audio_pdr.c
+++ b/drivers/soc/qcom/qdsp6v2/audio_pdr.c
@@ -112,7 +112,7 @@ int audio_pdr_service_deregister(void *service_handle,
ret = service_notif_unregister_notifier(
service_handle, nb);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
pr_err("%s: Failed to deregister service ret %d\n",
__func__, ret);
done:
@@ -135,7 +135,7 @@ static int __init audio_pdr_late_init(void)
audio_pdr_services[AUDIO_PDR_DOMAIN_ADSP].client_name,
audio_pdr_services[AUDIO_PDR_DOMAIN_ADSP].service_name,
&audio_pdr_locator_nb);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
pr_err("%s get_service_location failed ret %d\n",
__func__, ret);
srcu_notifier_call_chain(&audio_pdr_cb_list,
diff --git a/drivers/soc/qcom/wcd-dsp-glink.c b/drivers/soc/qcom/wcd-dsp-glink.c
index 3f9f229..758f627 100644
--- a/drivers/soc/qcom/wcd-dsp-glink.c
+++ b/drivers/soc/qcom/wcd-dsp-glink.c
@@ -234,7 +234,7 @@ static bool wdsp_glink_notify_rx_intent_req(void *handle, const void *priv,
mutex_lock(&ch->mutex);
rc = glink_queue_rx_intent(ch->handle, ch, req_size);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(wpriv->dev, "%s: Failed to queue rx intent, rc = %d\n",
__func__, rc);
mutex_unlock(&ch->mutex);
@@ -309,7 +309,7 @@ static void wdsp_glink_notify_state(void *handle, const void *priv,
ch->ch_cfg.intents_size[i]);
ret = glink_queue_rx_intent(ch->handle, ch,
ch->ch_cfg.intents_size[i]);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_warn(wpriv->dev, "%s: Failed to queue intent %d of size %d\n",
__func__, i,
ch->ch_cfg.intents_size[i]);
@@ -317,7 +317,7 @@ static void wdsp_glink_notify_state(void *handle, const void *priv,
ret = glink_qos_latency(ch->handle, ch->ch_cfg.latency_in_us,
QOS_PKT_SIZE);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_warn(wpriv->dev, "%s: Failed to request qos %d for ch %s\n",
__func__, ch->ch_cfg.latency_in_us,
ch->ch_cfg.name);
@@ -362,7 +362,7 @@ static int wdsp_glink_close_ch(struct wdsp_glink_ch *ch)
mutex_lock(&wpriv->glink_mutex);
if (ch->handle) {
ret = glink_close(ch->handle);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(wpriv->dev, "%s: glink_close is failed, ret = %d\n",
__func__, ret);
} else {
@@ -447,7 +447,7 @@ static int wdsp_glink_open_all_ch(struct wdsp_glink_priv *wpriv)
for (i = 0; i < wpriv->no_of_channels; i++) {
if (wpriv->ch && wpriv->ch[i]) {
ret = wdsp_glink_open_ch(wpriv->ch[i]);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
goto err_open;
}
}
@@ -627,7 +627,7 @@ static void wdsp_glink_tx_buf_work(struct work_struct *work)
ret = glink_tx(ch->handle, tx_buf,
cpkt->payload, cpkt->payload_size,
GLINK_TX_REQ_INTENT);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(wpriv->dev, "%s: glink tx failed, ret = %d\n",
__func__, ret);
/*
@@ -774,7 +774,7 @@ static ssize_t wdsp_glink_write(struct file *file, const char __user *buf,
case WDSP_REG_PKT:
ret = wdsp_glink_ch_info_init(wpriv,
(struct wdsp_reg_pkt *)wpkt->payload);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(wpriv->dev, "%s: glink register failed, ret = %d\n",
__func__, ret);
kfree(tx_buf);
@@ -1009,7 +1009,7 @@ static int wdsp_glink_probe(struct platform_device *pdev)
ret = alloc_chrdev_region(&wdev->dev_num, 0, MINOR_NUMBER_COUNT,
WDSP_GLINK_DRIVER_NAME);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&pdev->dev, "%s: Failed to alloc char dev, err = %d\n",
__func__, ret);
goto err_chrdev;
@@ -1034,7 +1034,7 @@ static int wdsp_glink_probe(struct platform_device *pdev)
cdev_init(&wdev->cdev, &wdsp_glink_fops);
ret = cdev_add(&wdev->cdev, wdev->dev_num, MINOR_NUMBER_COUNT);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&pdev->dev, "%s: Failed to register char dev, err = %d\n",
__func__, ret);
goto err_cdev_add;
diff --git a/sound/soc/codecs/msm8x16/msm8x16-wcd.c b/sound/soc/codecs/msm8x16/msm8x16-wcd.c
index bb84725..f76dde7 100644
--- a/sound/soc/codecs/msm8x16/msm8x16-wcd.c
+++ b/sound/soc/codecs/msm8x16/msm8x16-wcd.c
@@ -1487,7 +1487,7 @@ static struct msm8x16_wcd_pdata *msm8x16_wcd_populate_dt_pdata(
return NULL;
static_cnt = of_property_count_strings(dev->of_node, static_prop_name);
- if (IS_ERR_VALUE(static_cnt)) {
+ if (static_cnt < 0) {
dev_err(dev, "%s: Failed to get static supplies %d\n", __func__,
static_cnt);
ret = -EINVAL;
@@ -1496,7 +1496,7 @@ static struct msm8x16_wcd_pdata *msm8x16_wcd_populate_dt_pdata(
/* On-demand supply list is an optional property */
ond_cnt = of_property_count_strings(dev->of_node, ond_prop_name);
- if (IS_ERR_VALUE(ond_cnt))
+ if (ond_cnt < 0)
ond_cnt = 0;
WARN_ON(static_cnt <= 0 || ond_cnt < 0);
diff --git a/sound/soc/codecs/msm_hdmi_codec_rx.c b/sound/soc/codecs/msm_hdmi_codec_rx.c
index 1ba1d02..cd5e707 100644
--- a/sound/soc/codecs/msm_hdmi_codec_rx.c
+++ b/sound/soc/codecs/msm_hdmi_codec_rx.c
@@ -56,8 +56,7 @@ static int msm_ext_disp_edid_ctl_info(struct snd_kcontrol *kcontrol,
rc = codec_data->ext_disp_ops.get_audio_edid_blk(
codec_data->ext_disp_core_pdev, &edid_blk);
-
- if (!IS_ERR_VALUE(rc)) {
+ if (rc >= 0) {
uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
uinfo->count = edid_blk.audio_data_blk_size +
edid_blk.spk_alloc_data_blk_size;
@@ -84,7 +83,7 @@ static int msm_ext_disp_edid_get(struct snd_kcontrol *kcontrol,
rc = codec_data->ext_disp_ops.get_audio_edid_blk(
codec_data->ext_disp_core_pdev, &edid_blk);
- if (!IS_ERR_VALUE(rc)) {
+ if (rc >= 0) {
memcpy(ucontrol->value.bytes.data,
edid_blk.audio_data_blk,
edid_blk.audio_data_blk_size);
@@ -121,7 +120,7 @@ static int msm_ext_disp_audio_type_get(struct snd_kcontrol *kcontrol,
cable_state = codec_data->ext_disp_ops.cable_status(
codec_data->ext_disp_core_pdev, 1);
- if (IS_ERR_VALUE(cable_state)) {
+ if (cable_state < 0) {
dev_err(codec->dev, "%s: Error retrieving cable state from ext_disp, err:%d\n",
__func__, cable_state);
rc = cable_state;
@@ -139,7 +138,7 @@ static int msm_ext_disp_audio_type_get(struct snd_kcontrol *kcontrol,
disp_type = codec_data->ext_disp_ops.get_intf_id(
codec_data->ext_disp_core_pdev);
- if (!IS_ERR_VALUE(disp_type)) {
+ if (disp_type >= 0) {
switch (disp_type) {
case EXT_DISPLAY_TYPE_DP:
ucontrol->value.integer.value[0] = 2;
@@ -205,7 +204,7 @@ static int msm_ext_disp_audio_codec_rx_dai_startup(
codec_data->cable_status =
codec_data->ext_disp_ops.cable_status(
codec_data->ext_disp_core_pdev, 1);
- if (IS_ERR_VALUE(codec_data->cable_status)) {
+ if (codec_data->cable_status < 0) {
dev_err(dai->dev,
"%s() ext disp core is not ready (ret val = %d)\n",
__func__, codec_data->cable_status);
@@ -241,7 +240,7 @@ static int msm_ext_disp_audio_codec_rx_dai_hw_params(
return -EINVAL;
}
- if (IS_ERR_VALUE(codec_data->cable_status)) {
+ if (codec_data->cable_status < 0) {
dev_err_ratelimited(dai->dev,
"%s() ext disp core is not ready (ret val = %d)\n",
__func__, codec_data->cable_status);
@@ -300,7 +299,7 @@ static int msm_ext_disp_audio_codec_rx_dai_hw_params(
rc = codec_data->ext_disp_ops.audio_info_setup(
codec_data->ext_disp_core_pdev, &audio_setup_params);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err_ratelimited(dai->dev,
"%s() ext disp core is not ready, rc: %d\n",
__func__, rc);
@@ -327,7 +326,7 @@ static void msm_ext_disp_audio_codec_rx_dai_shutdown(
rc = codec_data->ext_disp_ops.cable_status(
codec_data->ext_disp_core_pdev, 0);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev,
"%s: ext disp core had problems releasing audio flag\n",
__func__);
diff --git a/sound/soc/codecs/wcd-dsp-mgr.c b/sound/soc/codecs/wcd-dsp-mgr.c
index f51301d..5c27f10 100644
--- a/sound/soc/codecs/wcd-dsp-mgr.c
+++ b/sound/soc/codecs/wcd-dsp-mgr.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -362,7 +362,7 @@ static int wdsp_load_each_segment(struct wdsp_mgr_priv *wdsp,
ret = wdsp_unicast_event(wdsp, WDSP_CMPNT_TRANSPORT,
WDSP_EVENT_DLOAD_SECTION,
&img_section);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
WDSP_ERR(wdsp,
"Failed, err = %d for base_addr = 0x%x split_fname = %s, load_addr = 0x%x, size = 0x%zx",
ret, wdsp->base_addr, seg->split_fname,
@@ -396,7 +396,7 @@ static int wdsp_download_segments(struct wdsp_mgr_priv *wdsp,
ret = wdsp_get_segment_list(ctl->cdev, wdsp->img_fname,
type, wdsp->seg_list, &wdsp->base_addr);
- if (IS_ERR_VALUE(ret) ||
+ if (ret < 0 ||
list_empty(wdsp->seg_list)) {
WDSP_ERR(wdsp, "Error %d to get image segments for type %d",
ret, type);
@@ -411,7 +411,7 @@ static int wdsp_download_segments(struct wdsp_mgr_priv *wdsp,
/* Go through the list of segments and download one by one */
list_for_each_entry(seg, wdsp->seg_list, list) {
ret = wdsp_load_each_segment(wdsp, seg);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
wdsp_broadcast_event_downseq(wdsp,
WDSP_EVENT_DLOAD_FAILED,
NULL);
@@ -440,7 +440,7 @@ static int wdsp_init_and_dload_code_sections(struct wdsp_mgr_priv *wdsp)
if (!is_initialized) {
/* Components are not initialized yet, initialize them */
ret = wdsp_init_components(wdsp);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
WDSP_ERR(wdsp, "INIT failed, err = %d", ret);
goto done;
}
@@ -449,7 +449,7 @@ static int wdsp_init_and_dload_code_sections(struct wdsp_mgr_priv *wdsp)
/* Download the read-execute sections of image */
ret = wdsp_download_segments(wdsp, WDSP_ELF_FLAG_RE);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
WDSP_ERR(wdsp, "Error %d to download code sections", ret);
goto done;
}
@@ -469,7 +469,7 @@ static void wdsp_load_fw_image(struct work_struct *work)
}
ret = wdsp_init_and_dload_code_sections(wdsp);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
WDSP_ERR(wdsp, "dload code sections failed, err = %d", ret);
}
@@ -486,7 +486,7 @@ static int wdsp_enable_dsp(struct wdsp_mgr_priv *wdsp)
/* Download the read-write sections of image */
ret = wdsp_download_segments(wdsp, WDSP_ELF_FLAG_WRITE);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
WDSP_ERR(wdsp, "Data section download failed, err = %d", ret);
goto done;
}
@@ -495,7 +495,7 @@ static int wdsp_enable_dsp(struct wdsp_mgr_priv *wdsp)
ret = wdsp_unicast_event(wdsp, WDSP_CMPNT_CONTROL,
WDSP_EVENT_DO_BOOT, NULL);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
WDSP_ERR(wdsp, "Failed to boot dsp, err = %d", ret);
WDSP_CLEAR_STATUS(wdsp, WDSP_STATUS_DATA_DLOADED);
goto done;
@@ -536,7 +536,7 @@ static int wdsp_disable_dsp(struct wdsp_mgr_priv *wdsp)
wdsp_broadcast_event_downseq(wdsp, WDSP_EVENT_PRE_SHUTDOWN, NULL);
ret = wdsp_unicast_event(wdsp, WDSP_CMPNT_CONTROL,
WDSP_EVENT_DO_SHUTDOWN, NULL);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
WDSP_ERR(wdsp, "Failed to shutdown dsp, err = %d", ret);
goto done;
}
@@ -650,7 +650,7 @@ static void wdsp_collect_ramdumps(struct wdsp_mgr_priv *wdsp)
ret = wdsp_unicast_event(wdsp, WDSP_CMPNT_TRANSPORT,
WDSP_EVENT_READ_SECTION,
&img_section);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
WDSP_ERR(wdsp, "Failed to read dumps, size 0x%zx at addr 0x%x",
img_section.size, img_section.addr);
goto err_read_dumps;
@@ -661,7 +661,7 @@ static void wdsp_collect_ramdumps(struct wdsp_mgr_priv *wdsp)
rd_seg.v_address = wdsp->dump_data.rd_v_addr;
ret = do_ramdump(wdsp->dump_data.rd_dev, &rd_seg, 1);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
WDSP_ERR(wdsp, "do_ramdump failed with error %d", ret);
err_read_dumps:
@@ -689,7 +689,7 @@ static void wdsp_ssr_work_fn(struct work_struct *work)
wdsp_collect_ramdumps(wdsp);
ret = wdsp_unicast_event(wdsp, WDSP_CMPNT_CONTROL,
WDSP_EVENT_DO_SHUTDOWN, NULL);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
WDSP_ERR(wdsp, "Failed WDSP shutdown, err = %d", ret);
wdsp_broadcast_event_downseq(wdsp, WDSP_EVENT_POST_SHUTDOWN,
@@ -724,7 +724,7 @@ static void wdsp_ssr_work_fn(struct work_struct *work)
}
ret = wdsp_init_and_dload_code_sections(wdsp);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
WDSP_ERR(wdsp, "Failed to dload code sections err = %d",
ret);
goto done;
@@ -834,7 +834,7 @@ static int wdsp_signal_handler(struct device *wdsp_dev,
break;
}
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
WDSP_ERR(wdsp, "handling signal %d failed with error %d",
signal, ret);
WDSP_MGR_MUTEX_UNLOCK(wdsp, wdsp->api_mutex);
@@ -870,7 +870,7 @@ static int wdsp_vote_for_dsp(struct device *wdsp_dev,
ret = wdsp_disable_dsp(wdsp);
}
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
WDSP_DBG(wdsp, "wdsp %s failed, err = %d",
vote ? "enable" : "disable", ret);
@@ -925,7 +925,7 @@ static int wdsp_mgr_bind(struct device *dev)
dev_info(dev, "%s: create_ramdump_device failed\n", __func__);
ret = component_bind_all(dev, wdsp->ops);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
WDSP_ERR(wdsp, "component_bind_all failed %d\n", ret);
/* Make sure all components registered ops */
@@ -1027,7 +1027,7 @@ static int wdsp_mgr_parse_dt_entries(struct wdsp_mgr_priv *wdsp)
ret = of_property_read_string(dev->of_node, "qcom,img-filename",
&wdsp->img_fname);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
WDSP_ERR(wdsp, "Reading property %s failed, error = %d",
"qcom,img-filename", ret);
return ret;
@@ -1100,7 +1100,7 @@ static int wdsp_mgr_probe(struct platform_device *pdev)
ret = component_master_add_with_match(mdev, &wdsp_master_ops,
wdsp->match);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
WDSP_ERR(wdsp, "Failed to add master, err = %d", ret);
goto err_master_add;
}
diff --git a/sound/soc/codecs/wcd-dsp-utils.c b/sound/soc/codecs/wcd-dsp-utils.c
index 1f04891..4eafd55 100644
--- a/sound/soc/codecs/wcd-dsp-utils.c
+++ b/sound/soc/codecs/wcd-dsp-utils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -76,7 +76,7 @@ static int wdsp_add_segment_to_list(struct device *dev,
snprintf(seg->split_fname, sizeof(seg->split_fname),
"%s.b%02d", img_fname, phdr_idx);
ret = request_firmware(&seg->split_fw, seg->split_fname, dev);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(dev, "%s: firmware %s not found\n",
__func__, seg->split_fname);
goto bad_seg;
@@ -162,7 +162,7 @@ int wdsp_get_segment_list(struct device *dev,
snprintf(mdt_name, sizeof(mdt_name), "%s.mdt", img_fname);
ret = request_firmware(&fw, mdt_name, dev);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(dev, "%s: firmware %s not found\n",
__func__, mdt_name);
goto done;
@@ -205,7 +205,7 @@ int wdsp_get_segment_list(struct device *dev,
if (segment_match) {
ret = wdsp_add_segment_to_list(dev, img_fname, phdr,
phdr_idx, seg_list);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
wdsp_flush_segment_list(seg_list);
goto bad_elf;
}
diff --git a/sound/soc/codecs/wcd-spi.c b/sound/soc/codecs/wcd-spi.c
index b3fbc89..c08e746 100644
--- a/sound/soc/codecs/wcd-spi.c
+++ b/sound/soc/codecs/wcd-spi.c
@@ -314,7 +314,7 @@ static int wcd_spi_write_multi(struct spi_device *spi,
xfer->len = xfer_len;
ret = spi_sync(spi, &wcd_spi->msg1);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(&spi->dev,
"%s: Failed, addr = 0x%x, len = %zd\n",
__func__, remote_addr, len);
@@ -342,7 +342,7 @@ static int wcd_spi_transfer_split(struct spi_device *spi,
else
ret = wcd_spi_read_single(spi, addr,
(u32 *)data);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev,
"%s: %s fail iter(%d) start-word addr (0x%x)\n",
__func__, wcd_spi_xfer_req_str(xfer_req),
@@ -365,7 +365,7 @@ static int wcd_spi_transfer_split(struct spi_device *spi,
else
ret = wcd_spi_read_multi(spi, addr, data,
WCD_SPI_RW_MULTI_MAX_LEN);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev,
"%s: %s fail iter(%d) max-write addr (0x%x)\n",
__func__, wcd_spi_xfer_req_str(xfer_req),
@@ -390,7 +390,7 @@ static int wcd_spi_transfer_split(struct spi_device *spi,
ret = wcd_spi_write_multi(spi, addr, data, to_xfer);
else
ret = wcd_spi_read_multi(spi, addr, data, to_xfer);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev,
"%s: %s fail write addr (0x%x), size (0x%x)\n",
__func__, wcd_spi_xfer_req_str(xfer_req),
@@ -410,7 +410,7 @@ static int wcd_spi_transfer_split(struct spi_device *spi,
ret = wcd_spi_write_single(spi, addr, (*((u32 *)data)));
else
ret = wcd_spi_read_single(spi, addr, (u32 *) data);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev,
"%s: %s fail iter(%d) end-write addr (0x%x)\n",
__func__, wcd_spi_xfer_req_str(xfer_req),
@@ -479,7 +479,7 @@ static int wcd_spi_cmd_rdsr(struct spi_device *spi,
rx_xfer->len = sizeof(status);
ret = spi_sync(spi, &wcd_spi->msg2);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev, "%s: RDSR failed, err = %d\n",
__func__, ret);
goto done;
@@ -500,21 +500,21 @@ static int wcd_spi_clk_enable(struct spi_device *spi)
u32 rd_status;
ret = wcd_spi_cmd_nop(spi);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev, "%s: NOP1 failed, err = %d\n",
__func__, ret);
goto done;
}
ret = wcd_spi_cmd_clkreq(spi);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev, "%s: CLK_REQ failed, err = %d\n",
__func__, ret);
goto done;
}
ret = wcd_spi_cmd_nop(spi);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev, "%s: NOP2 failed, err = %d\n",
__func__, ret);
goto done;
@@ -543,7 +543,7 @@ static int wcd_spi_clk_disable(struct spi_device *spi)
int ret;
ret = wcd_spi_write_single(spi, WCD_SPI_ADDR_IPC_CTL_HOST, 0x01);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(&spi->dev, "%s: Failed, err = %d\n",
__func__, ret);
else
@@ -612,7 +612,7 @@ static int wcd_spi_clk_ctrl(struct spi_device *spi,
msecs_to_jiffies(WCD_SPI_CLK_OFF_TIMER_MS));
} else {
ret = wcd_spi_clk_disable(spi);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(&spi->dev,
"%s: Failed to disable clk err = %d\n",
__func__, ret);
@@ -635,11 +635,11 @@ static int wcd_spi_init(struct spi_device *spi)
ret = wcd_spi_clk_ctrl(spi, WCD_SPI_CLK_ENABLE,
WCD_SPI_CLK_FLAG_IMMEDIATE);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
goto done;
ret = wcd_spi_cmd_wr_en(spi);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
goto err_wr_en;
/*
@@ -677,7 +677,7 @@ static void wcd_spi_clk_work(struct work_struct *work)
WCD_SPI_MUTEX_LOCK(spi, wcd_spi->clk_mutex);
ret = wcd_spi_clk_disable(spi);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(&spi->dev,
"%s: Failed to disable clk, err = %d\n",
__func__, ret);
@@ -735,7 +735,7 @@ static int wcd_spi_data_xfer(struct spi_device *spi,
/* Request for clock */
ret = wcd_spi_clk_ctrl(spi, WCD_SPI_CLK_ENABLE,
WCD_SPI_CLK_FLAG_IMMEDIATE);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev, "%s: clk enable failed %d\n",
__func__, ret);
goto done;
@@ -743,7 +743,7 @@ static int wcd_spi_data_xfer(struct spi_device *spi,
/* Perform the transaction */
ret = __wcd_spi_data_xfer(spi, msg, req);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(&spi->dev,
"%s: Failed %s, addr = 0x%x, size = 0x%zx, err = %d\n",
__func__, wcd_spi_xfer_req_str(req),
@@ -752,7 +752,7 @@ static int wcd_spi_data_xfer(struct spi_device *spi,
/* Release the clock even if xfer failed */
ret1 = wcd_spi_clk_ctrl(spi, WCD_SPI_CLK_DISABLE,
WCD_SPI_CLK_FLAG_DELAYED);
- if (IS_ERR_VALUE(ret1))
+ if (ret1 < 0)
dev_err(&spi->dev, "%s: clk disable failed %d\n",
__func__, ret1);
done:
@@ -823,7 +823,7 @@ static int wdsp_spi_dload_section(struct spi_device *spi,
msg.len = sec->size;
ret = __wcd_spi_data_xfer(spi, &msg, WCD_SPI_XFER_WRITE);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(&spi->dev, "%s: fail addr (0x%x) size (0x%zx)\n",
__func__, msg.remote_addr, msg.len);
return ret;
@@ -844,7 +844,7 @@ static int wdsp_spi_read_section(struct spi_device *spi, void *data)
__func__, msg.remote_addr, msg.len);
ret = wcd_spi_data_xfer(spi, &msg, WCD_SPI_XFER_READ);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(&spi->dev, "%s: fail addr (0x%x) size (0x%zx)\n",
__func__, msg.remote_addr, msg.len);
return ret;
@@ -865,7 +865,7 @@ static int wdsp_spi_event_handler(struct device *dev, void *priv_data,
case WDSP_EVENT_PRE_DLOAD_DATA:
ret = wcd_spi_clk_ctrl(spi, WCD_SPI_CLK_ENABLE,
WCD_SPI_CLK_FLAG_IMMEDIATE);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(&spi->dev, "%s: clk_req failed %d\n",
__func__, ret);
break;
@@ -876,7 +876,7 @@ static int wdsp_spi_event_handler(struct device *dev, void *priv_data,
ret = wcd_spi_clk_ctrl(spi, WCD_SPI_CLK_DISABLE,
WCD_SPI_CLK_FLAG_IMMEDIATE);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(&spi->dev, "%s: clk unvote failed %d\n",
__func__, ret);
break;
@@ -1054,7 +1054,7 @@ static ssize_t wcd_spi_debugfs_mem_read(struct file *file, char __user *ubuf,
msg.flags = 0;
ret = wcd_spi_data_read(spi, &msg);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev,
"%s: Failed to read %zu bytes from addr 0x%x\n",
__func__, buf_size, msg.remote_addr);
@@ -1175,7 +1175,7 @@ static int wdsp_spi_init(struct device *dev, void *priv_data)
int ret;
ret = wcd_spi_init(spi);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(&spi->dev, "%s: Init failed, err = %d\n",
__func__, ret);
return ret;
@@ -1281,7 +1281,7 @@ static int wcd_spi_probe(struct spi_device *spi)
ret = of_property_read_u32(spi->dev.of_node,
"qcom,mem-base-addr",
&wcd_spi->mem_base_addr);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(&spi->dev, "%s: Missing %s DT entry",
__func__, "qcom,mem-base-addr");
goto err_ret;
diff --git a/sound/soc/codecs/wcd9330.c b/sound/soc/codecs/wcd9330.c
index 06f4059..a53a956 100644
--- a/sound/soc/codecs/wcd9330.c
+++ b/sound/soc/codecs/wcd9330.c
@@ -5765,8 +5765,7 @@ static void tomtom_set_rxsb_port_format(struct snd_pcm_hw_params *params,
list_for_each_entry(ch, &cdc_dai->wcd9xxx_ch_list, list) {
port = wcd9xxx_get_slave_port(ch->ch_num);
-
- if (IS_ERR_VALUE(port) ||
+ if (port < 0 ||
!TOMTOM_VALIDATE_RX_SBPORT_RANGE(port)) {
dev_warn(codec->dev,
"%s: invalid port ID %d returned for RX DAI\n",
@@ -5825,8 +5824,7 @@ static void tomtom_set_tx_sb_port_format(struct snd_pcm_hw_params *params,
list_for_each_entry(ch, &cdc_dai->wcd9xxx_ch_list, list) {
port = wcd9xxx_get_slave_port(ch->ch_num);
-
- if (IS_ERR_VALUE(port) ||
+ if (port < 0 ||
!TOMTOM_VALIDATE_TX_SBPORT_RANGE(port)) {
dev_warn(codec->dev,
"%s: invalid port ID %d returned for TX DAI\n",
@@ -7300,8 +7298,7 @@ static int tomtom_handle_pdata(struct tomtom_priv *tomtom)
pdata->micbias.cfilt2_mv);
k3 = wcd9xxx_resmgr_get_k_val(&tomtom->resmgr,
pdata->micbias.cfilt3_mv);
-
- if (IS_ERR_VALUE(k1) || IS_ERR_VALUE(k2) || IS_ERR_VALUE(k3)) {
+ if (k1 < 0 || k2 < 0 || k3 < 0) {
rc = -EINVAL;
goto done;
}
@@ -8467,7 +8464,7 @@ static int tomtom_post_reset_cb(struct wcd9xxx *wcd9xxx)
snd_soc_cache_sync(codec);
ret = tomtom_handle_pdata(tomtom);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
pr_err("%s: bad pdata\n", __func__);
tomtom_init_slim_slave_cfg(codec);
@@ -8875,7 +8872,7 @@ static int tomtom_codec_probe(struct snd_soc_component *component)
tomtom_codec_init_reg(codec);
ret = tomtom_handle_pdata(tomtom);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
pr_err("%s: bad pdata\n", __func__);
goto err_hwdep;
}
diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c
index 9f64858..3da18b1 100644
--- a/sound/soc/codecs/wcd9335.c
+++ b/sound/soc/codecs/wcd9335.c
@@ -1768,7 +1768,7 @@ static int tasha_mbhc_micb_adjust_voltage(struct snd_soc_codec *codec,
cur_vout_ctl = micb_val & 0x3F;
req_vout_ctl = wcd9335_get_micb_vout_ctl_val(req_volt);
- if (IS_ERR_VALUE(req_vout_ctl))
+ if (req_vout_ctl < 0)
return -EINVAL;
if (cur_vout_ctl == req_vout_ctl)
return 0;
@@ -12846,9 +12846,8 @@ static int tasha_handle_pdata(struct tasha_priv *tasha,
vout_ctl_2 = wcd9335_get_micb_vout_ctl_val(pdata->micbias.micb2_mv);
vout_ctl_3 = wcd9335_get_micb_vout_ctl_val(pdata->micbias.micb3_mv);
vout_ctl_4 = wcd9335_get_micb_vout_ctl_val(pdata->micbias.micb4_mv);
-
- if (IS_ERR_VALUE(vout_ctl_1) || IS_ERR_VALUE(vout_ctl_2) ||
- IS_ERR_VALUE(vout_ctl_3) || IS_ERR_VALUE(vout_ctl_4)) {
+ if (vout_ctl_1 < 0 || vout_ctl_2 < 0 ||
+ vout_ctl_3 < 0 || vout_ctl_4 < 0) {
rc = -EINVAL;
goto done;
}
@@ -13469,7 +13468,7 @@ static int tasha_post_reset_cb(struct wcd9xxx *wcd9xxx)
pdata = dev_get_platdata(codec->dev->parent);
ret = tasha_handle_pdata(tasha, pdata);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(codec->dev, "%s: invalid pdata\n", __func__);
/* MBHC Init */
@@ -13576,7 +13575,7 @@ static int tasha_codec_probe(struct snd_soc_component *component)
pdata = dev_get_platdata(codec->dev->parent);
ret = tasha_handle_pdata(tasha, pdata);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
pr_err("%s: bad pdata\n", __func__);
goto err;
}
diff --git a/sound/soc/codecs/wcd934x/wcd934x-dsp-cntl.c b/sound/soc/codecs/wcd934x/wcd934x-dsp-cntl.c
index 6a5da91..9bc5d5f 100644
--- a/sound/soc/codecs/wcd934x/wcd934x-dsp-cntl.c
+++ b/sound/soc/codecs/wcd934x/wcd934x-dsp-cntl.c
@@ -110,7 +110,7 @@ static ssize_t wdsp_boot_store(struct wcd_dsp_cntl *cntl,
else
ret = -EINVAL;
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(cntl->codec->dev,
"%s: failed to %s dsp\n", __func__,
vote ? "enable" : "disable");
@@ -356,7 +356,7 @@ static int wcd_cntl_cpe_fll_ctrl(struct wcd_dsp_cntl *cntl,
if (enable) {
ret = wcd_cntl_cpe_fll_calibrate(cntl);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev,
"%s: cpe_fll_cal failed, err = %d\n",
__func__, ret);
@@ -395,7 +395,7 @@ static int wcd_cntl_clocks_enable(struct wcd_dsp_cntl *cntl)
else
ret = -EINVAL;
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev,
"%s: Failed to enable cdc clk, err = %d\n",
__func__, ret);
@@ -404,7 +404,7 @@ static int wcd_cntl_clocks_enable(struct wcd_dsp_cntl *cntl)
/* Configure and Enable CPE FLL clock */
ret = wcd_cntl_cpe_fll_ctrl(cntl, true);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev,
"%s: Failed to enable cpe clk, err = %d\n",
__func__, ret);
@@ -443,7 +443,7 @@ static int wcd_cntl_clocks_disable(struct wcd_dsp_cntl *cntl)
/* Disable CPE FLL clock */
ret = wcd_cntl_cpe_fll_ctrl(cntl, false);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(codec->dev,
"%s: Failed to disable cpe clk, err = %d\n",
__func__, ret);
@@ -705,7 +705,7 @@ static irqreturn_t wcd_cntl_ipc_irq(int irq, void *data)
else
ret = -EINVAL;
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(cntl->codec->dev,
"%s: Failed to handle irq %d\n", __func__, irq);
@@ -737,7 +737,7 @@ static irqreturn_t wcd_cntl_err_irq(int irq, void *data)
arg.dump_size = WCD_934X_RAMDUMP_SIZE;
ret = cntl->m_ops->signal_handler(cntl->m_dev, WDSP_ERR_INTR,
&arg);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(cntl->codec->dev,
"%s: Failed to handle fatal irq 0x%x\n",
__func__, status & cntl->irqs.fatal_irqs);
@@ -771,7 +771,7 @@ static int wcd_control_handler(struct device *dev, void *priv_data,
wcd_cntl_cpar_ctrl(cntl, false);
/* Disable all the clocks */
ret = wcd_cntl_clocks_disable(cntl);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(codec->dev,
"%s: Failed to disable clocks, err = %d\n",
__func__, ret);
@@ -782,7 +782,7 @@ static int wcd_control_handler(struct device *dev, void *priv_data,
/* Enable all the clocks */
ret = wcd_cntl_clocks_enable(cntl);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev,
"%s: Failed to enable clocks, err = %d\n",
__func__, ret);
@@ -801,7 +801,7 @@ static int wcd_control_handler(struct device *dev, void *priv_data,
case WDSP_EVENT_DO_BOOT:
ret = wcd_cntl_do_boot(cntl);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(codec->dev,
"%s: WDSP boot failed, err = %d\n",
__func__, ret);
@@ -829,7 +829,7 @@ static int wcd_cntl_sysfs_init(char *dir, struct wcd_dsp_cntl *cntl)
ret = kobject_init_and_add(&cntl->wcd_kobj, &wcd_cntl_ktype,
kernel_kobj, dir);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev,
"%s: Failed to add kobject %s, err = %d\n",
__func__, dir, ret);
@@ -837,7 +837,7 @@ static int wcd_cntl_sysfs_init(char *dir, struct wcd_dsp_cntl *cntl)
}
ret = sysfs_create_file(&cntl->wcd_kobj, &cntl_attr_boot.attr);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev,
"%s: Failed to add wdsp_boot sysfs entry to %s\n",
__func__, dir);
@@ -919,7 +919,7 @@ static ssize_t wcd_miscdev_write(struct file *filep, const char __user *ubuf,
}
ret = copy_from_user(val, ubuf, count);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(cntl->codec->dev,
"%s: copy_from_user failed, err = %d\n",
__func__, ret);
@@ -998,7 +998,7 @@ static int wcd_control_init(struct device *dev, void *priv_data)
cntl->irqs.cpe_ipc1_irq,
wcd_cntl_ipc_irq, "CPE IPC1",
cntl);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev,
"%s: Failed to request cpe ipc irq, err = %d\n",
__func__, ret);
@@ -1026,7 +1026,7 @@ static int wcd_control_init(struct device *dev, void *priv_data)
/* Enable all the clocks */
ret = wcd_cntl_clocks_enable(cntl);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev, "%s: Failed to enable clocks, err = %d\n",
__func__, ret);
goto err_clk_enable;
@@ -1118,7 +1118,7 @@ static int wcd_ctrl_component_bind(struct device *dev,
}
ret = wcd_cntl_miscdev_create(cntl);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(dev, "%s: misc dev register failed, err = %d\n",
__func__, ret);
goto done;
@@ -1127,7 +1127,7 @@ static int wcd_ctrl_component_bind(struct device *dev,
snprintf(wcd_cntl_dir_name, WCD_CNTL_DIR_NAME_LEN_MAX,
"%s%d", "wdsp", cntl->dsp_instance);
ret = wcd_cntl_sysfs_init(wcd_cntl_dir_name, cntl);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(dev, "%s: sysfs_init failed, err = %d\n",
__func__, ret);
goto err_sysfs_init;
@@ -1154,7 +1154,7 @@ static int wcd_ctrl_component_bind(struct device *dev,
entry->c.ops = &wdsp_ssr_entry_ops;
entry->private_data = cntl;
ret = snd_info_register(entry);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(dev, "%s: Failed to register entry %s, err = %d\n",
__func__, proc_name, ret);
snd_info_free_entry(entry);
@@ -1233,7 +1233,7 @@ int wcd_dsp_ssr_event(struct wcd_dsp_cntl *cntl, enum cdc_ssr_event event)
ret = cntl->m_ops->signal_handler(cntl->m_dev,
WDSP_CDC_DOWN_SIGNAL,
NULL);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(cntl->codec->dev,
"%s: WDSP_CDC_DOWN_SIGNAL failed, err = %d\n",
__func__, ret);
@@ -1243,7 +1243,7 @@ int wcd_dsp_ssr_event(struct wcd_dsp_cntl *cntl, enum cdc_ssr_event event)
ret = cntl->m_ops->signal_handler(cntl->m_dev,
WDSP_CDC_UP_SIGNAL,
NULL);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(cntl->codec->dev,
"%s: WDSP_CDC_UP_SIGNAL failed, err = %d\n",
__func__, ret);
diff --git a/sound/soc/codecs/wcd934x/wcd934x.c b/sound/soc/codecs/wcd934x/wcd934x.c
index 56a03c7..d30ba9c 100644
--- a/sound/soc/codecs/wcd934x/wcd934x.c
+++ b/sound/soc/codecs/wcd934x/wcd934x.c
@@ -1044,7 +1044,7 @@ static int tavil_codec_enable_anc(struct snd_soc_dapm_widget *w,
} else {
filename = "WCD934X/WCD934X_anc.bin";
ret = request_firmware(&fw, filename, codec->dev);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev, "%s: Failed to acquire ANC data: %d\n",
__func__, ret);
return ret;
@@ -2564,7 +2564,7 @@ static int __tavil_codec_enable_mad(struct snd_soc_codec *codec, bool enable)
snd_soc_update_bits(codec, WCD934X_SOC_MAD_AUDIO_CTL_2,
0x03, 0x03);
rc = tavil_codec_config_mad(codec);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
snd_soc_update_bits(codec, WCD934X_SOC_MAD_AUDIO_CTL_2,
0x03, 0x00);
goto done;
@@ -2629,7 +2629,7 @@ static int tavil_codec_cpe_mad_ctl(struct snd_soc_dapm_widget *w,
snd_soc_update_bits(codec, WCD934X_CPE_SS_SVA_CFG, 0x20, 0x20);
rc = __tavil_codec_enable_mad(codec, true);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
tavil->mad_switch_cnt--;
goto done;
}
@@ -4136,7 +4136,7 @@ int tavil_mbhc_micb_adjust_voltage(struct snd_soc_codec *codec,
cur_vout_ctl = micb_val & 0x3F;
req_vout_ctl = wcd934x_get_micb_vout_ctl_val(req_volt);
- if (IS_ERR_VALUE(req_vout_ctl)) {
+ if (req_vout_ctl < 0) {
ret = -EINVAL;
goto exit;
}
@@ -8538,9 +8538,8 @@ static int tavil_handle_pdata(struct tavil_priv *tavil,
vout_ctl_2 = wcd934x_get_micb_vout_ctl_val(pdata->micbias.micb2_mv);
vout_ctl_3 = wcd934x_get_micb_vout_ctl_val(pdata->micbias.micb3_mv);
vout_ctl_4 = wcd934x_get_micb_vout_ctl_val(pdata->micbias.micb4_mv);
-
- if (IS_ERR_VALUE(vout_ctl_1) || IS_ERR_VALUE(vout_ctl_2) ||
- IS_ERR_VALUE(vout_ctl_3) || IS_ERR_VALUE(vout_ctl_4)) {
+ if (vout_ctl_1 < 0 || vout_ctl_2 < 0 ||
+ vout_ctl_3 < 0 || vout_ctl_4 < 0) {
rc = -EINVAL;
goto done;
}
@@ -8822,7 +8821,7 @@ static int tavil_post_reset_cb(struct wcd9xxx *wcd9xxx)
pdata = dev_get_platdata(codec->dev->parent);
ret = tavil_handle_pdata(tavil, pdata);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(codec->dev, "%s: invalid pdata\n", __func__);
/* Initialize MBHC module */
@@ -8906,7 +8905,7 @@ static int tavil_soc_codec_probe(struct snd_soc_component *component)
ret = wcd_cal_create_hwdep(tavil->fw_data,
WCD9XXX_CODEC_HWDEP_NODE, codec);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev, "%s hwdep failed %d\n", __func__, ret);
goto err_hwdep;
}
@@ -8926,7 +8925,7 @@ static int tavil_soc_codec_probe(struct snd_soc_component *component)
pdata = dev_get_platdata(codec->dev->parent);
ret = tavil_handle_pdata(tavil, pdata);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(codec->dev, "%s: bad pdata\n", __func__);
goto err_hwdep;
}
@@ -9316,7 +9315,7 @@ static void tavil_codec_add_spi_device(struct tavil_priv *tavil,
/* Read the master bus num from DT node */
rc = of_property_read_u32(node, "qcom,master-bus-num",
&prop_value);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(tavil->dev, "%s: prop %s not found in node %s",
__func__, "qcom,master-bus-num", node->full_name);
goto done;
@@ -9348,7 +9347,7 @@ static void tavil_codec_add_spi_device(struct tavil_priv *tavil,
rc = of_property_read_u32(node, "qcom,chip-select",
&prop_value);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(tavil->dev, "%s: prop %s not found in node %s",
__func__, "qcom,chip-select", node->full_name);
goto err_dt_parse;
@@ -9357,7 +9356,7 @@ static void tavil_codec_add_spi_device(struct tavil_priv *tavil,
rc = of_property_read_u32(node, "qcom,max-frequency",
&prop_value);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(tavil->dev, "%s: prop %s not found in node %s",
__func__, "qcom,max-frequency", node->full_name);
goto err_dt_parse;
@@ -9367,7 +9366,7 @@ static void tavil_codec_add_spi_device(struct tavil_priv *tavil,
spi->dev.of_node = node;
rc = spi_add_device(spi);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(tavil->dev, "%s: spi_add_device failed\n", __func__);
goto err_dt_parse;
}
diff --git a/sound/soc/codecs/wcd9xxx-mbhc.c b/sound/soc/codecs/wcd9xxx-mbhc.c
index 84d4fc5..3754b57 100644
--- a/sound/soc/codecs/wcd9xxx-mbhc.c
+++ b/sound/soc/codecs/wcd9xxx-mbhc.c
@@ -4350,29 +4350,27 @@ static int wcd9xxx_init_and_calibrate(struct wcd9xxx_mbhc *mbhc)
snd_soc_update_bits(codec, WCD9XXX_A_MBHC_HPH, 0x01, 0x01);
INIT_WORK(&mbhc->correct_plug_swch, wcd9xxx_correct_swch_plug);
- if (!IS_ERR_VALUE(ret)) {
- snd_soc_update_bits(codec, WCD9XXX_A_RX_HPH_OCP_CTL, 0x10,
- 0x10);
- wcd9xxx_enable_irq(mbhc->resmgr->core_res,
- mbhc->intr_ids->hph_left_ocp);
- wcd9xxx_enable_irq(mbhc->resmgr->core_res,
- mbhc->intr_ids->hph_right_ocp);
+ snd_soc_update_bits(codec, WCD9XXX_A_RX_HPH_OCP_CTL, 0x10,
+ 0x10);
+ wcd9xxx_enable_irq(mbhc->resmgr->core_res,
+ mbhc->intr_ids->hph_left_ocp);
+ wcd9xxx_enable_irq(mbhc->resmgr->core_res,
+ mbhc->intr_ids->hph_right_ocp);
- /* Initialize mechanical mbhc */
- ret = wcd9xxx_setup_jack_detect_irq(mbhc);
+ /* Initialize mechanical mbhc */
+ ret = wcd9xxx_setup_jack_detect_irq(mbhc);
- if (!ret && mbhc->mbhc_cfg->gpio) {
- /* Requested with IRQF_DISABLED */
- enable_irq(mbhc->mbhc_cfg->gpio_irq);
+ if (!ret && mbhc->mbhc_cfg->gpio) {
+ /* Requested with IRQF_DISABLED */
+ enable_irq(mbhc->mbhc_cfg->gpio_irq);
- /* Bootup time detection */
- wcd9xxx_swch_irq_handler(mbhc);
- } else if (!ret && mbhc->mbhc_cfg->insert_detect) {
- pr_debug("%s: Setting up codec own insert detection\n",
- __func__);
- /* Setup for insertion detection */
- wcd9xxx_insert_detect_setup(mbhc, true);
- }
+ /* Bootup time detection */
+ wcd9xxx_swch_irq_handler(mbhc);
+ } else if (!ret && mbhc->mbhc_cfg->insert_detect) {
+ pr_debug("%s: Setting up codec own insert detection\n",
+ __func__);
+ /* Setup for insertion detection */
+ wcd9xxx_insert_detect_setup(mbhc, true);
}
pr_debug("%s: leave\n", __func__);
diff --git a/sound/soc/codecs/wcd_cpe_core.c b/sound/soc/codecs/wcd_cpe_core.c
index 7fc6d2e..c98fdc9 100644
--- a/sound/soc/codecs/wcd_cpe_core.c
+++ b/sound/soc/codecs/wcd_cpe_core.c
@@ -176,7 +176,7 @@ static int wcd_cpe_get_sfr_dump(struct wcd_cpe_core *core)
__func__, core->sfr_buf_size);
rc = cpe_svc_ramdump(core->cpe_handle, &dump_seg);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(core->dev,
"%s: Failed to read cpe sfr_dump, err = %d\n",
__func__, rc);
@@ -216,7 +216,7 @@ static int wcd_cpe_collect_ramdump(struct wcd_cpe_core *core)
__func__);
rc = cpe_svc_ramdump(core->cpe_handle, &dump_seg);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(core->dev,
"%s: Failed to read CPE ramdump, err = %d\n",
__func__, rc);
@@ -473,7 +473,7 @@ static int wcd_cpe_load_fw(struct wcd_cpe_core *core,
wcd9xxx = dev_get_drvdata(codec->dev->parent);
snprintf(mdt_name, sizeof(mdt_name), "%s.mdt", core->fname);
ret = request_firmware(&fw, mdt_name, core->dev);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev, "firmware %s not found\n", mdt_name);
return ret;
}
@@ -491,7 +491,7 @@ static int wcd_cpe_load_fw(struct wcd_cpe_core *core,
if (load_type == ELF_FLAG_EXECUTE) {
/* Reset CPE first */
ret = cpe_svc_reset(core->cpe_handle);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev,
"%s: Failed to reset CPE with error %d\n",
__func__, ret);
@@ -534,7 +534,7 @@ static int wcd_cpe_load_fw(struct wcd_cpe_core *core,
if (load_segment) {
ret = wcd_cpe_load_each_segment(core,
phdr_idx, phdr);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev,
"Failed to load segment %d, aborting img dload\n",
phdr_idx);
@@ -666,7 +666,7 @@ static irqreturn_t svass_engine_irq(int irq, void *data)
}
ret = cpe_svc_process_irq(core->cpe_handle, CPE_IRQ_OUTBOX_IRQ);
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
dev_err(core->dev,
"%s: Error processing irq from cpe_Services\n",
__func__);
@@ -822,7 +822,7 @@ static int wcd_cpe_enable(struct wcd_cpe_core *core,
if (enable) {
/* Reset CPE first */
ret = cpe_svc_reset(core->cpe_handle);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev,
"%s: CPE Reset failed, error = %d\n",
__func__, ret);
@@ -850,7 +850,7 @@ static int wcd_cpe_enable(struct wcd_cpe_core *core,
}
ret = wcd_cpe_enable_cpe_clks(core, true);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev,
"%s: CPE clk enable failed, err = %d\n",
__func__, ret);
@@ -859,7 +859,7 @@ static int wcd_cpe_enable(struct wcd_cpe_core *core,
ret = cpe_svc_boot(core->cpe_handle,
core->cpe_debug_mode);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev,
"%s: Failed to boot CPE\n",
__func__);
@@ -899,7 +899,7 @@ static int wcd_cpe_enable(struct wcd_cpe_core *core,
}
ret = cpe_svc_shutdown(core->cpe_handle);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev,
"%s: CPE shutdown failed, error %d\n",
__func__, ret);
@@ -1036,7 +1036,7 @@ static void wcd_cpe_ssr_work(struct work_struct *work)
if (core->cpe_users > 0) {
rc = cpe_svc_process_irq(core->cpe_handle, irq);
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
/*
* Even if process_irq fails,
* wait for cpe to move to offline state
@@ -1826,7 +1826,7 @@ static ssize_t cpe_ftm_test_trigger(struct file *file,
/* Enable the clks for cpe */
ret = wcd_cpe_enable_cpe_clks(core, true);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev,
"%s: CPE clk enable failed, err = %d\n",
__func__, ret);
@@ -1835,7 +1835,7 @@ static ssize_t cpe_ftm_test_trigger(struct file *file,
/* Get the CPE_STATUS */
ret = cpe_svc_ftm_test(core->cpe_handle, &cpe_ftm_test_status);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev,
"%s: CPE FTM test failed, err = %d\n",
__func__, ret);
@@ -1847,7 +1847,7 @@ static ssize_t cpe_ftm_test_trigger(struct file *file,
/* Disable the clks for cpe */
ret = wcd_cpe_enable_cpe_clks(core, false);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev,
"%s: CPE clk disable failed, err = %d\n",
__func__, ret);
@@ -2007,7 +2007,7 @@ struct wcd_cpe_core *wcd_cpe_init(const char *img_fname,
core_d = core;
ret = wcd_cpe_cal_init(core);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(core->dev,
"%s: CPE calibration init failed, err = %d\n",
__func__, ret);
diff --git a/sound/soc/msm/msm-cpe-lsm.c b/sound/soc/msm/msm-cpe-lsm.c
index 71b2598..44927c8 100644
--- a/sound/soc/msm/msm-cpe-lsm.c
+++ b/sound/soc/msm/msm-cpe-lsm.c
@@ -1119,7 +1119,7 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream,
if (session->lab_enable) {
rc = msm_cpe_lab_buf_alloc(substream,
session, dma_data);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(rtd->dev,
"%s: lab buffer alloc failed, err = %d\n",
__func__, rc);
@@ -1138,7 +1138,7 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream,
&substream->dma_buffer);
rc = lsm_ops->lsm_lab_control(cpe->core_handle,
session, true);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(rtd->dev,
"%s: Lab Enable Failed rc %d\n",
__func__, rc);
@@ -1152,7 +1152,7 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream,
* the lab buffer.
*/
rc = msm_cpe_lsm_lab_stop(substream);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(rtd->dev,
"%s: LAB stop failed, error = %d\n",
__func__, rc);
@@ -1164,7 +1164,7 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream,
*/
rc = msm_cpe_lab_buf_dealloc(substream,
session, dma_data);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(rtd->dev,
"%s: lab buffer free failed, err = %d\n",
__func__, rc);
@@ -1289,7 +1289,7 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream,
*/
rc = msm_cpe_lab_buf_dealloc(substream,
session, dma_data);
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(rtd->dev,
"%s: lab buffer free failed, err = %d\n",
__func__, rc);
diff --git a/sound/soc/msm/msm8998.c b/sound/soc/msm/msm8998.c
index 5dcddb2..73755ed 100644
--- a/sound/soc/msm/msm8998.c
+++ b/sound/soc/msm/msm8998.c
@@ -2921,7 +2921,7 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
case MSM_BACKEND_DAI_HDMI_RX:
case MSM_BACKEND_DAI_DISPLAY_PORT_RX:
idx = msm_ext_disp_get_idx_from_beid(dai_link->id);
- if (IS_ERR_VALUE(idx)) {
+ if (idx < 0) {
pr_err("%s: Incorrect ext disp idx %d\n",
__func__, idx);
rc = idx;
@@ -3824,7 +3824,7 @@ static int msm_aux_pcm_snd_startup(struct snd_pcm_substream *substream)
ret = -EINVAL;
}
}
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
auxpcm_intf_conf[index].ref_cnt--;
mutex_unlock(&auxpcm_intf_conf[index].lock);
@@ -3952,7 +3952,7 @@ static int msm_mi2s_set_sclk(struct snd_pcm_substream *substream, bool enable)
int index = cpu_dai->id;
port_id = msm_get_port_id(rtd->dai_link->id);
- if (IS_ERR_VALUE(port_id)) {
+ if (port_id < 0) {
dev_err(rtd->card->dev, "%s: Invalid port_id\n", __func__);
ret = port_id;
goto done;
@@ -4006,7 +4006,7 @@ static int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
mutex_lock(&mi2s_intf_conf[index].lock);
if (++mi2s_intf_conf[index].ref_cnt == 1) {
ret = msm_mi2s_set_sclk(substream, true);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(rtd->card->dev,
"%s: afe lpass clock failed to enable MI2S clock, err:%d\n",
__func__, ret);
@@ -4028,17 +4028,17 @@ static int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
if (!mi2s_intf_conf[index].msm_is_mi2s_master)
fmt = SND_SOC_DAIFMT_CBM_CFM;
ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
pr_err("%s: set fmt cpu dai failed for MI2S (%d), err:%d\n",
__func__, index, ret);
goto clk_off;
}
}
clk_off:
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
msm_mi2s_set_sclk(substream, false);
clean_up:
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
mi2s_intf_conf[index].ref_cnt--;
mutex_unlock(&mi2s_intf_conf[index].lock);
done:
diff --git a/sound/soc/msm/msmfalcon-common.c b/sound/soc/msm/msmfalcon-common.c
index 5928982..fba9c28 100644
--- a/sound/soc/msm/msmfalcon-common.c
+++ b/sound/soc/msm/msmfalcon-common.c
@@ -1920,7 +1920,7 @@ int msm_aux_pcm_snd_startup(struct snd_pcm_substream *substream)
ret = -EINVAL;
}
}
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
auxpcm_intf_conf[index].ref_cnt--;
mutex_unlock(&auxpcm_intf_conf[index].lock);
@@ -2055,7 +2055,7 @@ static int msm_mi2s_set_sclk(struct snd_pcm_substream *substream, bool enable)
int index = cpu_dai->id;
port_id = msm_get_port_id(rtd->dai_link->be_id);
- if (IS_ERR_VALUE(port_id)) {
+ if (port_id < 0) {
dev_err(rtd->card->dev, "%s: Invalid port_id\n", __func__);
ret = port_id;
goto done;
@@ -2116,7 +2116,7 @@ int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
mutex_lock(&mi2s_intf_conf[index].lock);
if (++mi2s_intf_conf[index].ref_cnt == 1) {
ret = msm_mi2s_set_sclk(substream, true);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(rtd->card->dev,
"%s: afe lpass clock failed to enable MI2S clock, err:%d\n",
__func__, ret);
@@ -2138,7 +2138,7 @@ int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
if (!mi2s_intf_conf[index].msm_is_mi2s_master)
fmt = SND_SOC_DAIFMT_CBM_CFM;
ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(rtd->card->dev,
"%s: set fmt cpu dai failed for MI2S (%d), err:%d\n",
__func__, index, ret);
@@ -2146,10 +2146,10 @@ int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
}
}
clk_off:
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
msm_mi2s_set_sclk(substream, false);
clean_up:
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
mi2s_intf_conf[index].ref_cnt--;
mutex_unlock(&mi2s_intf_conf[index].lock);
done:
diff --git a/sound/soc/msm/msmfalcon-internal.c b/sound/soc/msm/msmfalcon-internal.c
index 34db650..50efd69 100644
--- a/sound/soc/msm/msmfalcon-internal.c
+++ b/sound/soc/msm/msmfalcon-internal.c
@@ -1067,7 +1067,7 @@ static int int_mi2s_set_sclk(struct snd_pcm_substream *substream, bool enable)
int index;
port_id = int_mi2s_get_port_id(rtd->dai_link->be_id);
- if (IS_ERR_VALUE(port_id)) {
+ if (port_id < 0) {
dev_err(rtd->card->dev, "%s: Invalid port_id\n", __func__);
ret = port_id;
goto done;
diff --git a/sound/soc/msm/msmskunk.c b/sound/soc/msm/msmskunk.c
index 0d09a24..4759235 100644
--- a/sound/soc/msm/msmskunk.c
+++ b/sound/soc/msm/msmskunk.c
@@ -2860,7 +2860,7 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
case MSM_BACKEND_DAI_DISPLAY_PORT_RX:
idx = msm_ext_disp_get_idx_from_beid(dai_link->id);
- if (IS_ERR_VALUE(idx)) {
+ if (idx < 0) {
pr_err("%s: Incorrect ext disp idx %d\n",
__func__, idx);
rc = idx;
@@ -3617,7 +3617,7 @@ static int msm_aux_pcm_snd_startup(struct snd_pcm_substream *substream)
ret = -EINVAL;
}
}
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
auxpcm_intf_conf[index].ref_cnt--;
mutex_unlock(&auxpcm_intf_conf[index].lock);
@@ -3745,7 +3745,7 @@ static int msm_mi2s_set_sclk(struct snd_pcm_substream *substream, bool enable)
int index = cpu_dai->id;
port_id = msm_get_port_id(rtd->dai_link->id);
- if (IS_ERR_VALUE(port_id)) {
+ if (port_id < 0) {
dev_err(rtd->card->dev, "%s: Invalid port_id\n", __func__);
ret = port_id;
goto err;
@@ -3799,7 +3799,7 @@ static int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
mutex_lock(&mi2s_intf_conf[index].lock);
if (++mi2s_intf_conf[index].ref_cnt == 1) {
ret = msm_mi2s_set_sclk(substream, true);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
dev_err(rtd->card->dev,
"%s: afe lpass clock failed to enable MI2S clock, err:%d\n",
__func__, ret);
@@ -3821,17 +3821,17 @@ static int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
if (!mi2s_intf_conf[index].msm_is_mi2s_master)
fmt = SND_SOC_DAIFMT_CBM_CFM;
ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
- if (IS_ERR_VALUE(ret)) {
+ if (ret < 0) {
pr_err("%s: set fmt cpu dai failed for MI2S (%d), err:%d\n",
__func__, index, ret);
goto clk_off;
}
}
clk_off:
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
msm_mi2s_set_sclk(substream, false);
clean_up:
- if (IS_ERR_VALUE(ret))
+ if (ret < 0)
mi2s_intf_conf[index].ref_cnt--;
mutex_unlock(&mi2s_intf_conf[index].lock);
err:
diff --git a/sound/soc/msm/qdsp6v2/msm-dai-q6-hdmi-v2.c b/sound/soc/msm/qdsp6v2/msm-dai-q6-hdmi-v2.c
index d4118b0..dffac45 100644
--- a/sound/soc/msm/qdsp6v2/msm-dai-q6-hdmi-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-dai-q6-hdmi-v2.c
@@ -222,8 +222,7 @@ static void msm_dai_q6_hdmi_shutdown(struct snd_pcm_substream *substream,
}
rc = afe_close(dai->id); /* can block */
-
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close AFE port\n");
pr_debug("%s: dai_data->status_mask = %ld\n", __func__,
@@ -246,7 +245,7 @@ static int msm_dai_q6_hdmi_prepare(struct snd_pcm_substream *substream,
if (!test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) {
rc = afe_port_start(dai->id, &dai_data->port_config,
dai_data->rate);
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to open AFE port %x\n",
dai->id);
else
@@ -351,8 +350,7 @@ static int msm_dai_q6_hdmi_dai_remove(struct snd_soc_dai *dai)
/* If AFE port is still up, close it */
if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) {
rc = afe_close(dai->id); /* can block */
-
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close AFE port\n");
clear_bit(STATUS_PORT_STARTED, dai_data->status_mask);
diff --git a/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c b/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
index d9f9c58..52c2296 100644
--- a/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
@@ -771,11 +771,11 @@ static void msm_dai_q6_auxpcm_shutdown(struct snd_pcm_substream *substream,
__func__, dai->id);
rc = afe_close(aux_dai_data->rx_pid); /* can block */
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close PCM_RX AFE port\n");
rc = afe_close(aux_dai_data->tx_pid);
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close AUX PCM TX port\n");
msm_dai_q6_auxpcm_set_clk(aux_dai_data, aux_dai_data->rx_pid, false);
@@ -826,7 +826,7 @@ static int msm_dai_q6_auxpcm_prepare(struct snd_pcm_substream *substream,
__func__, dai->id);
rc = afe_q6_interface_prepare();
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "fail to open AFE APR\n");
goto fail;
}
@@ -978,10 +978,10 @@ static int msm_dai_q6_dai_auxpcm_remove(struct snd_soc_dai *dai)
if (test_bit(STATUS_TX_PORT, aux_dai_data->auxpcm_port_status) ||
test_bit(STATUS_RX_PORT, aux_dai_data->auxpcm_port_status)) {
rc = afe_close(aux_dai_data->rx_pid); /* can block */
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close AUXPCM RX AFE port\n");
rc = afe_close(aux_dai_data->tx_pid);
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close AUXPCM TX AFE port\n");
clear_bit(STATUS_TX_PORT, aux_dai_data->auxpcm_port_status);
clear_bit(STATUS_RX_PORT, aux_dai_data->auxpcm_port_status);
@@ -1273,8 +1273,7 @@ static void msm_dai_q6_spdif_shutdown(struct snd_pcm_substream *substream,
}
rc = afe_close(dai->id);
-
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close AFE port\n");
pr_debug("%s: dai_data->status_mask = %ld\n", __func__,
@@ -1290,14 +1289,10 @@ static int msm_dai_q6_spdif_prepare(struct snd_pcm_substream *substream,
struct msm_dai_q6_spdif_dai_data *dai_data = dev_get_drvdata(dai->dev);
int rc = 0;
- if (IS_ERR_VALUE(rc)) {
- dev_err(dai->dev, "%s: clk_config failed", __func__);
- return rc;
- }
if (!test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) {
rc = afe_spdif_port_start(dai->id, &dai_data->spdif_port,
dai_data->rate);
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to open AFE port 0x%x\n",
dai->id);
else
@@ -1372,8 +1367,7 @@ static int msm_dai_q6_spdif_dai_remove(struct snd_soc_dai *dai)
/* If AFE port is still up, close it */
if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) {
rc = afe_close(dai->id); /* can block */
-
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close AFE port\n");
clear_bit(STATUS_PORT_STARTED, dai_data->status_mask);
@@ -1441,7 +1435,7 @@ static int msm_dai_q6_prepare(struct snd_pcm_substream *substream,
rc = afe_port_start(dai->id, &dai_data->port_config,
dai_data->rate);
}
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to open AFE port 0x%x\n",
dai->id);
else
@@ -1808,8 +1802,7 @@ static void msm_dai_q6_shutdown(struct snd_pcm_substream *substream,
if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) {
pr_debug("%s: stop pseudo port:%d\n", __func__, dai->id);
rc = afe_close(dai->id); /* can block */
-
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close AFE port\n");
pr_debug("%s: dai_data->status_mask = %ld\n", __func__,
*dai_data->status_mask);
@@ -2374,7 +2367,7 @@ static int msm_dai_q6_dai_probe(struct snd_soc_dai *dai)
dai_data));
break;
}
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "%s: err add config ctl, DAI = %s\n",
__func__, dai->name);
@@ -2393,8 +2386,7 @@ static int msm_dai_q6_dai_remove(struct snd_soc_dai *dai)
if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) {
pr_debug("%s: stop pseudo port:%d\n", __func__, dai->id);
rc = afe_close(dai->id); /* can block */
-
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close AFE port\n");
clear_bit(STATUS_PORT_STARTED, dai_data->status_mask);
}
@@ -3381,8 +3373,7 @@ static int msm_dai_q6_dai_mi2s_probe(struct snd_soc_dai *dai)
kcontrol = snd_ctl_new1(ctrl,
&mi2s_dai_data->rx_dai.mi2s_dai_data);
rc = snd_ctl_add(dai->component->card->snd_card, kcontrol);
-
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "%s: err add RX fmt ctl DAI = %s\n",
__func__, dai->name);
goto rtn;
@@ -3409,8 +3400,7 @@ static int msm_dai_q6_dai_mi2s_probe(struct snd_soc_dai *dai)
rc = snd_ctl_add(dai->component->card->snd_card,
snd_ctl_new1(ctrl,
&mi2s_dai_data->tx_dai.mi2s_dai_data));
-
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
if (kcontrol)
snd_ctl_remove(dai->component->card->snd_card,
kcontrol);
@@ -3434,7 +3424,7 @@ static int msm_dai_q6_dai_mi2s_remove(struct snd_soc_dai *dai)
if (test_bit(STATUS_PORT_STARTED,
mi2s_dai_data->rx_dai.mi2s_dai_data.status_mask)) {
rc = afe_close(MI2S_RX); /* can block */
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close MI2S_RX port\n");
clear_bit(STATUS_PORT_STARTED,
mi2s_dai_data->rx_dai.mi2s_dai_data.status_mask);
@@ -3442,7 +3432,7 @@ static int msm_dai_q6_dai_mi2s_remove(struct snd_soc_dai *dai)
if (test_bit(STATUS_PORT_STARTED,
mi2s_dai_data->tx_dai.mi2s_dai_data.status_mask)) {
rc = afe_close(MI2S_TX); /* can block */
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close MI2S_TX port\n");
clear_bit(STATUS_PORT_STARTED,
mi2s_dai_data->tx_dai.mi2s_dai_data.status_mask);
@@ -3597,8 +3587,7 @@ static int msm_dai_q6_mi2s_prepare(struct snd_pcm_substream *substream,
*/
rc = afe_port_start(port_id, &dai_data->port_config,
dai_data->rate);
-
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to open AFE port 0x%x\n",
dai->id);
else
@@ -3819,7 +3808,7 @@ static void msm_dai_q6_mi2s_shutdown(struct snd_pcm_substream *substream,
if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) {
rc = afe_close(port_id);
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
dev_err(dai->dev, "fail to close AFE port\n");
clear_bit(STATUS_PORT_STARTED, dai_data->status_mask);
}
@@ -4292,8 +4281,7 @@ static int msm_dai_q6_mi2s_platform_data_validation(
rc = msm_dai_q6_mi2s_get_lineconfig(mi2s_pdata->rx_sd_lines,
&sd_line, &ch_cnt);
-
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(&pdev->dev, "invalid MI2S RX sd line config\n");
goto rtn;
}
@@ -4310,8 +4298,7 @@ static int msm_dai_q6_mi2s_platform_data_validation(
}
rc = msm_dai_q6_mi2s_get_lineconfig(mi2s_pdata->tx_sd_lines,
&sd_line, &ch_cnt);
-
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(&pdev->dev, "invalid MI2S TX sd line config\n");
goto rtn;
}
@@ -4411,13 +4398,12 @@ static int msm_dai_q6_mi2s_dev_probe(struct platform_device *pdev)
rc = msm_dai_q6_mi2s_platform_data_validation(pdev,
&msm_dai_q6_mi2s_dai[mi2s_intf]);
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
goto free_dai_data;
rc = snd_soc_register_component(&pdev->dev, &msm_q6_mi2s_dai_component,
&msm_dai_q6_mi2s_dai[mi2s_intf], 1);
-
- if (IS_ERR_VALUE(rc))
+ if (rc < 0)
goto err_register;
return 0;
@@ -5771,8 +5757,7 @@ static int msm_dai_q6_dai_tdm_probe(struct snd_soc_dai *dai)
tdm_dai_data);
rc = snd_ctl_add(dai->component->card->snd_card,
data_format_kcontrol);
-
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "%s: err add data format ctrl DAI = %s\n",
__func__, dai->name);
goto rtn;
@@ -5784,8 +5769,7 @@ static int msm_dai_q6_dai_tdm_probe(struct snd_soc_dai *dai)
tdm_dai_data);
rc = snd_ctl_add(dai->component->card->snd_card,
header_type_kcontrol);
-
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
if (data_format_kcontrol)
snd_ctl_remove(dai->component->card->snd_card,
data_format_kcontrol);
@@ -5800,8 +5784,7 @@ static int msm_dai_q6_dai_tdm_probe(struct snd_soc_dai *dai)
tdm_dai_data);
rc = snd_ctl_add(dai->component->card->snd_card,
header_kcontrol);
-
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
if (header_type_kcontrol)
snd_ctl_remove(dai->component->card->snd_card,
header_type_kcontrol);
@@ -5842,7 +5825,7 @@ static int msm_dai_q6_dai_tdm_remove(struct snd_soc_dai *dai)
/* If AFE port is still up, close it */
if (test_bit(STATUS_PORT_STARTED, tdm_dai_data->status_mask)) {
rc = afe_close(dai->id); /* can block */
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "%s: fail to close AFE port 0x%x\n",
__func__, dai->id);
}
@@ -5853,13 +5836,13 @@ static int msm_dai_q6_dai_tdm_remove(struct snd_soc_dai *dai)
if (atomic_read(group_ref) == 0) {
rc = afe_port_group_enable(group_id,
NULL, false);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "fail to disable AFE group 0x%x\n",
group_id);
}
rc = msm_dai_q6_tdm_set_clk(tdm_dai_data,
dai->id, false);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "%s: fail to disable AFE clk 0x%x\n",
__func__, dai->id);
}
@@ -6307,14 +6290,14 @@ static int msm_dai_q6_tdm_prepare(struct snd_pcm_substream *substream,
*/
rc = msm_dai_q6_tdm_set_clk(dai_data,
dai->id, true);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "%s: fail to enable AFE clk 0x%x\n",
__func__, dai->id);
goto rtn;
}
rc = afe_port_group_enable(group_id,
&dai_data->group_cfg, true);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "%s: fail to enable AFE group 0x%x\n",
__func__, group_id);
goto rtn;
@@ -6323,7 +6306,7 @@ static int msm_dai_q6_tdm_prepare(struct snd_pcm_substream *substream,
rc = afe_tdm_port_start(dai->id, &dai_data->port_cfg,
dai_data->rate);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
if (atomic_read(group_ref) == 0) {
afe_port_group_enable(group_id,
NULL, false);
@@ -6371,7 +6354,7 @@ static void msm_dai_q6_tdm_shutdown(struct snd_pcm_substream *substream,
if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) {
rc = afe_close(dai->id);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "%s: fail to close AFE port 0x%x\n",
__func__, dai->id);
}
@@ -6382,13 +6365,13 @@ static void msm_dai_q6_tdm_shutdown(struct snd_pcm_substream *substream,
if (atomic_read(group_ref) == 0) {
rc = afe_port_group_enable(group_id,
NULL, false);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "%s: fail to disable AFE group 0x%x\n",
__func__, group_id);
}
rc = msm_dai_q6_tdm_set_clk(dai_data,
dai->id, false);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dai->dev, "%s: fail to disable AFE clk 0x%x\n",
__func__, dai->id);
}
diff --git a/sound/soc/msm/qdsp6v2/msm-dai-slim.c b/sound/soc/msm/qdsp6v2/msm-dai-slim.c
index e012cf2..77fb8d4 100644
--- a/sound/soc/msm/qdsp6v2/msm-dai-slim.c
+++ b/sound/soc/msm/qdsp6v2/msm-dai-slim.c
@@ -130,8 +130,7 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,
SLIM_REQ_DEFAULT, dai_data->ch_cnt,
&(dma_data->ph),
sizeof(dma_data->ph));
-
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(&sdev->dev,
"%s:alloc mgrport failed rc %d\n",
__func__, rc);
@@ -141,7 +140,7 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,
rc = slim_config_mgrports(sdev, &(dma_data->ph),
dai_data->ch_cnt,
&(dai_data->port_cfg));
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(&sdev->dev,
"%s: config mgrport failed rc %d\n",
__func__, rc);
@@ -152,7 +151,7 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,
rc = slim_connect_sink(sdev,
&dma_data->ph, 1,
dai_data->chan_h[i]);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(&sdev->dev,
"%s: slim_connect_sink failed, ch = %d, err = %d\n",
__func__, i, rc);
@@ -163,7 +162,7 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,
rc = slim_control_ch(sdev,
dai_data->grph,
SLIM_CH_ACTIVATE, true);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(&sdev->dev,
"%s: slim activate ch failed, err = %d\n",
__func__, rc);
@@ -182,7 +181,7 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,
rc = slim_control_ch(sdev,
dai_data->grph,
SLIM_CH_REMOVE, true);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(&sdev->dev,
"%s: slim activate ch failed, err = %d\n",
__func__, rc);
@@ -191,7 +190,7 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,
rc = slim_dealloc_mgrports(sdev,
&dma_data->ph, 1);
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(&sdev->dev,
"%s: dealloc mgrport failed, err = %d\n",
__func__, rc);
@@ -206,7 +205,7 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,
err_done:
rc1 = slim_dealloc_mgrports(sdev,
&dma_data->ph, 1);
- if (IS_ERR_VALUE(rc1))
+ if (rc1 < 0)
dev_err(&sdev->dev,
"%s: dealloc mgrport failed, err = %d\n",
__func__, rc1);
@@ -596,8 +595,7 @@ static int msm_dai_slim_dev_probe(struct slim_device *sdev)
rc = snd_soc_register_component(&sdev->dev, &msm_dai_slim_component,
msm_slim_dais, NUM_SLIM_DAIS);
-
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
dev_err(dev, "%s: failed to register DAI, err = %d\n",
__func__, rc);
goto err_reg_comp;
diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-routing-devdep.c b/sound/soc/msm/qdsp6v2/msm-pcm-routing-devdep.c
index 2e86be0..1dfbd7a 100644
--- a/sound/soc/msm/qdsp6v2/msm-pcm-routing-devdep.c
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-devdep.c
@@ -157,7 +157,7 @@ int msm_pcm_routing_hwdep_new(struct snd_soc_pcm_runtime *runtime,
__func__, msm_bedais[dai_link->id].name);
return rc;
}
- if (IS_ERR_VALUE(rc)) {
+ if (rc < 0) {
pr_err("%s: hwdep intf failed to create %s rc %d\n", __func__,
msm_bedais[dai_link->id].name, rc);
return rc;