mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-05 19:31:57 -04:00
Merge remote-tracking branch 'sm8350/lineage-20' into lineage-23.2
* sm8350/lineage-20: techpack: audio: wcd_cpe: Fix -Wimplicit-enum-enum-cast qcacld-3.0: Fix implicit enum-enum-cast warnings Change-Id: Ibce416295c81d6a22dd555343e60a405048c5c8d
This commit is contained in:
commit
b44ad6704a
2 changed files with 5 additions and 5 deletions
|
|
@ -629,7 +629,7 @@ htt_h2t_rx_ring_cfg_msg_hl(struct htt_pdev_t *pdev)
|
|||
|
||||
pkt = htt_htc_pkt_alloc(pdev);
|
||||
if (!pkt)
|
||||
return A_ERROR; /* failure */
|
||||
return QDF_STATUS_E_FAILURE; /* failure */
|
||||
|
||||
/*
|
||||
* show that this is not a tx frame download
|
||||
|
|
@ -645,7 +645,7 @@ htt_h2t_rx_ring_cfg_msg_hl(struct htt_pdev_t *pdev)
|
|||
HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, true);
|
||||
if (!msg) {
|
||||
htt_htc_pkt_free(pdev, pkt);
|
||||
return A_ERROR; /* failure */
|
||||
return QDF_STATUS_E_FAILURE; /* failure */
|
||||
}
|
||||
/*
|
||||
* Set the length of the message.
|
||||
|
|
|
|||
|
|
@ -987,7 +987,7 @@ static enum cpe_svc_result broadcast_boot_event(
|
|||
static enum cpe_process_result cpe_boot_initialize(struct cpe_info *t_info,
|
||||
enum cpe_svc_result *cpe_rc)
|
||||
{
|
||||
enum cpe_process_result rc = CPE_SVC_FAILED;
|
||||
enum cpe_process_result rc = CPE_PROC_FAILED;
|
||||
struct cpe_svc_notification payload;
|
||||
struct cmi_core_svc_event_system_boot *p = NULL;
|
||||
|
||||
|
|
@ -1991,7 +1991,7 @@ enum cmi_api_result cmi_send_msg(void *message)
|
|||
GFP_ATOMIC);
|
||||
if (!msg) {
|
||||
CPE_SVC_REL_LOCK(&cpe_d.cpe_api_mutex, "cpe_api");
|
||||
return CPE_SVC_NO_MEMORY;
|
||||
return CMI_API_NO_MEMORY;
|
||||
}
|
||||
|
||||
if (CMI_HDR_GET_OBM_FLAG(hdr) == CMI_OBM_FLAG_OUT_BAND)
|
||||
|
|
@ -2006,7 +2006,7 @@ enum cmi_api_result cmi_send_msg(void *message)
|
|||
if (!msg->payload) {
|
||||
kfree(msg);
|
||||
CPE_SVC_REL_LOCK(&cpe_d.cpe_api_mutex, "cpe_api");
|
||||
return CPE_SVC_NO_MEMORY;
|
||||
return CMI_API_NO_MEMORY;
|
||||
}
|
||||
|
||||
msg->address = 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue