Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7092d2c4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Fix warning messages"

parents 26dc72a0 957f1425

drivers/platform/msm/ipa/ipa_v2/ipa.c

+9 −9
Original line number Diff line number Diff line
@@ -3800,21 +3800,21 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 
	}



	/* init the lookaside cache */

	ipa_ctx->flt_rule_cache = kmem_cache_create("IPA FLT",

	ipa_ctx->flt_rule_cache = kmem_cache_create("IPA_FLT",

			sizeof(struct ipa_flt_entry), 0, 0, NULL);

	if (!ipa_ctx->flt_rule_cache) {

		IPAERR(":ipa flt cache create failed\n");

		result = -ENOMEM;

		goto fail_flt_rule_cache;

	}

	ipa_ctx->rt_rule_cache = kmem_cache_create("IPA RT",

	ipa_ctx->rt_rule_cache = kmem_cache_create("IPA_RT",

			sizeof(struct ipa_rt_entry), 0, 0, NULL);

	if (!ipa_ctx->rt_rule_cache) {

		IPAERR(":ipa rt cache create failed\n");

		result = -ENOMEM;

		goto fail_rt_rule_cache;

	}

	ipa_ctx->hdr_cache = kmem_cache_create("IPA HDR",

	ipa_ctx->hdr_cache = kmem_cache_create("IPA_HDR",

			sizeof(struct ipa_hdr_entry), 0, 0, NULL);

	if (!ipa_ctx->hdr_cache) {

		IPAERR(":ipa hdr cache create failed\n");
@@ -3822,14 +3822,14 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 
		goto fail_hdr_cache;

	}

	ipa_ctx->hdr_offset_cache =

	   kmem_cache_create("IPA HDR OFFSET",

	   kmem_cache_create("IPA_HDR_OFFSET",

			   sizeof(struct ipa_hdr_offset_entry), 0, 0, NULL);

	if (!ipa_ctx->hdr_offset_cache) {

		IPAERR(":ipa hdr off cache create failed\n");

		result = -ENOMEM;

		goto fail_hdr_offset_cache;

	}

	ipa_ctx->hdr_proc_ctx_cache = kmem_cache_create("IPA HDR PROC CTX",

	ipa_ctx->hdr_proc_ctx_cache = kmem_cache_create("IPA_HDR_PROC_CTX",

		sizeof(struct ipa_hdr_proc_ctx_entry), 0, 0, NULL);

	if (!ipa_ctx->hdr_proc_ctx_cache) {

		IPAERR(":ipa hdr proc ctx cache create failed\n");
@@ -3837,14 +3837,14 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 
		goto fail_hdr_proc_ctx_cache;

	}

	ipa_ctx->hdr_proc_ctx_offset_cache =

		kmem_cache_create("IPA HDR PROC CTX OFFSET",

		kmem_cache_create("IPA_HDR_PROC_CTX_OFFSET",

		sizeof(struct ipa_hdr_proc_ctx_offset_entry), 0, 0, NULL);

	if (!ipa_ctx->hdr_proc_ctx_offset_cache) {

		IPAERR(":ipa hdr proc ctx off cache create failed\n");

		result = -ENOMEM;

		goto fail_hdr_proc_ctx_offset_cache;

	}

	ipa_ctx->rt_tbl_cache = kmem_cache_create("IPA RT TBL",

	ipa_ctx->rt_tbl_cache = kmem_cache_create("IPA_RT_TBL",

			sizeof(struct ipa_rt_tbl), 0, 0, NULL);

	if (!ipa_ctx->rt_tbl_cache) {

		IPAERR(":ipa rt tbl cache create failed\n");
@@ -3852,7 +3852,7 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 
		goto fail_rt_tbl_cache;

	}

	ipa_ctx->tx_pkt_wrapper_cache =

	   kmem_cache_create("IPA TX PKT WRAPPER",

	   kmem_cache_create("IPA_TX_PKT_WRAPPER",

			   sizeof(struct ipa_tx_pkt_wrapper), 0, 0, NULL);

	if (!ipa_ctx->tx_pkt_wrapper_cache) {

		IPAERR(":ipa tx pkt wrapper cache create failed\n");
@@ -3860,7 +3860,7 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 
		goto fail_tx_pkt_wrapper_cache;

	}

	ipa_ctx->rx_pkt_wrapper_cache =

	   kmem_cache_create("IPA RX PKT WRAPPER",

	   kmem_cache_create("IPA_RX_PKT_WRAPPER",

			   sizeof(struct ipa_rx_pkt_wrapper), 0, 0, NULL);

	if (!ipa_ctx->rx_pkt_wrapper_cache) {

		IPAERR(":ipa rx pkt wrapper cache create failed\n");

drivers/platform/msm/ipa/ipa_v2/ipa_dma.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, 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
@@ -149,7 +149,7 @@ int ipa2_dma_init(void) 
	}



	ipa_dma_ctx_t->ipa_dma_xfer_wrapper_cache =

		kmem_cache_create("IPA DMA XFER WRAPPER",

		kmem_cache_create("IPA_DMA_XFER_WRAPPER",

			sizeof(struct ipa_dma_xfer_wrapper), 0, 0, NULL);

	if (!ipa_dma_ctx_t->ipa_dma_xfer_wrapper_cache) {

		IPAERR(":failed to create ipa dma xfer wrapper cache.\n");

drivers/platform/msm/ipa/ipa_v2/ipa_qmi_service.c

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static int ipa_check_qmi_response(int rc, 
			"Timeout for qmi request id %d\n", req_id);

			return rc;

		}

		if (rc == -ENETRESET) {

		if ((rc == -ENETRESET) || (rc == -ENODEV)) {

			IPAWANERR(

			"SSR while waiting for qmi request id %d\n", req_id);

			return rc;
@@ -789,7 +789,7 @@ static void ipa_q6_clnt_svc_arrive(struct work_struct *work) 
	/* Initialize modem IPA-driver */

	IPAWANDBG("send qmi_init_modem_send_sync_msg to modem\n");

	rc = qmi_init_modem_send_sync_msg();

	if (rc == -ENETRESET) {

	if ((rc == -ENETRESET) || (rc == -ENODEV)) {

		IPAWANERR("qmi_init_modem_send_sync_msg failed due to SSR!\n");

		/* Cleanup will take place when ipa_wwan_remove is called */

		return;

drivers/platform/msm/ipa/ipa_v3/ipa.c

+9 −9
Original line number Diff line number Diff line
@@ -4253,21 +4253,21 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
	ipa3_ctx->transport_pm.res_rel_in_prog = false;



	/* init the lookaside cache */

	ipa3_ctx->flt_rule_cache = kmem_cache_create("IPA FLT",

	ipa3_ctx->flt_rule_cache = kmem_cache_create("IPA_FLT",

			sizeof(struct ipa3_flt_entry), 0, 0, NULL);

	if (!ipa3_ctx->flt_rule_cache) {

		IPAERR(":ipa flt cache create failed\n");

		result = -ENOMEM;

		goto fail_flt_rule_cache;

	}

	ipa3_ctx->rt_rule_cache = kmem_cache_create("IPA RT",

	ipa3_ctx->rt_rule_cache = kmem_cache_create("IPA_RT",

			sizeof(struct ipa3_rt_entry), 0, 0, NULL);

	if (!ipa3_ctx->rt_rule_cache) {

		IPAERR(":ipa rt cache create failed\n");

		result = -ENOMEM;

		goto fail_rt_rule_cache;

	}

	ipa3_ctx->hdr_cache = kmem_cache_create("IPA HDR",

	ipa3_ctx->hdr_cache = kmem_cache_create("IPA_HDR",

			sizeof(struct ipa3_hdr_entry), 0, 0, NULL);

	if (!ipa3_ctx->hdr_cache) {

		IPAERR(":ipa hdr cache create failed\n");
@@ -4275,14 +4275,14 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
		goto fail_hdr_cache;

	}

	ipa3_ctx->hdr_offset_cache =

	   kmem_cache_create("IPA HDR OFFSET",

	   kmem_cache_create("IPA_HDR_OFFSET",

			   sizeof(struct ipa3_hdr_offset_entry), 0, 0, NULL);

	if (!ipa3_ctx->hdr_offset_cache) {

		IPAERR(":ipa hdr off cache create failed\n");

		result = -ENOMEM;

		goto fail_hdr_offset_cache;

	}

	ipa3_ctx->hdr_proc_ctx_cache = kmem_cache_create("IPA HDR PROC CTX",

	ipa3_ctx->hdr_proc_ctx_cache = kmem_cache_create("IPA_HDR_PROC_CTX",

		sizeof(struct ipa3_hdr_proc_ctx_entry), 0, 0, NULL);

	if (!ipa3_ctx->hdr_proc_ctx_cache) {

		IPAERR(":ipa hdr proc ctx cache create failed\n");
@@ -4290,14 +4290,14 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
		goto fail_hdr_proc_ctx_cache;

	}

	ipa3_ctx->hdr_proc_ctx_offset_cache =

		kmem_cache_create("IPA HDR PROC CTX OFFSET",

		kmem_cache_create("IPA_HDR_PROC_CTX_OFFSET",

		sizeof(struct ipa3_hdr_proc_ctx_offset_entry), 0, 0, NULL);

	if (!ipa3_ctx->hdr_proc_ctx_offset_cache) {

		IPAERR(":ipa hdr proc ctx off cache create failed\n");

		result = -ENOMEM;

		goto fail_hdr_proc_ctx_offset_cache;

	}

	ipa3_ctx->rt_tbl_cache = kmem_cache_create("IPA RT TBL",

	ipa3_ctx->rt_tbl_cache = kmem_cache_create("IPA_RT_TBL",

			sizeof(struct ipa3_rt_tbl), 0, 0, NULL);

	if (!ipa3_ctx->rt_tbl_cache) {

		IPAERR(":ipa rt tbl cache create failed\n");
@@ -4305,7 +4305,7 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
		goto fail_rt_tbl_cache;

	}

	ipa3_ctx->tx_pkt_wrapper_cache =

	   kmem_cache_create("IPA TX PKT WRAPPER",

	   kmem_cache_create("IPA_TX_PKT_WRAPPER",

			   sizeof(struct ipa3_tx_pkt_wrapper), 0, 0, NULL);

	if (!ipa3_ctx->tx_pkt_wrapper_cache) {

		IPAERR(":ipa tx pkt wrapper cache create failed\n");
@@ -4313,7 +4313,7 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
		goto fail_tx_pkt_wrapper_cache;

	}

	ipa3_ctx->rx_pkt_wrapper_cache =

	   kmem_cache_create("IPA RX PKT WRAPPER",

	   kmem_cache_create("IPA_RX_PKT_WRAPPER",

			   sizeof(struct ipa3_rx_pkt_wrapper), 0, 0, NULL);

	if (!ipa3_ctx->rx_pkt_wrapper_cache) {

		IPAERR(":ipa rx pkt wrapper cache create failed\n");

drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, 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
@@ -414,7 +414,7 @@ static int ipa3_check_qmi_response(int rc, 
			"Timeout for qmi request id %d\n", req_id);

			return rc;

		}

		if (rc == -ENETRESET) {

		if ((rc == -ENETRESET) || (rc == -ENODEV)) {

			IPAWANERR(

			"SSR while waiting for qmi request id %d\n", req_id);

			return rc;
@@ -852,7 +852,7 @@ static void ipa3_q6_clnt_svc_arrive(struct work_struct *work) 
	/* Initialize modem IPA-driver */

	IPAWANDBG("send ipa3_qmi_init_modem_send_sync_msg to modem\n");

	rc = ipa3_qmi_init_modem_send_sync_msg();

	if (rc == -ENETRESET) {

	if ((rc == -ENETRESET) || (rc == -ENODEV)) {

		IPAWANERR(

			"ipa3_qmi_init_modem_send_sync_msg failed due to SSR!\n");

		/* Cleanup will take place when ipa3_wwan_remove is called */