Merge "ASoC: msm: Fix the usage of macro IS_ERR_VALUE" into msm-4.8 (12a15994) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/mfd/msm-cdc-supply.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;

drivers/soc/qcom/avtimer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/soc/qcom/qdsp6v2/audio_notifier.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -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(&notifier_mutex);
		ret = audio_notifer_reg_client(client_data);
		if (IS_ERR_VALUE(ret)) {
		if (ret < 0) {
		mutex_unlock(&notifier_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);

drivers/soc/qcom/qdsp6v2/audio_pdr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,

drivers/soc/qcom/wcd-dsp-glink.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -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;