evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "cnss2: cnss_bus_get_wake_irq should return int"

Browse source
This commit is contained in:
Linux Build Service Account 2018-11-15 22:59:07 -08:00 • committed by Gerrit - the friendly Code Review server
commit 37b1261366
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/cnss2/bus.c
View file

@ -162,7 +162,7 @@ int cnss_bus_alloc_fw_mem(struct cnss_plat_data *plat_priv)
} }
} }
u32 cnss_bus_get_wake_irq(struct cnss_plat_data *plat_priv) int cnss_bus_get_wake_irq(struct cnss_plat_data *plat_priv)
{ {
if (!plat_priv) if (!plat_priv)
return -ENODEV; return -ENODEV;

2
drivers/net/wireless/cnss2/bus.h
View file

@ -42,7 +42,7 @@ int cnss_bus_init(struct cnss_plat_data *plat_priv);
void cnss_bus_deinit(struct cnss_plat_data *plat_priv); void cnss_bus_deinit(struct cnss_plat_data *plat_priv);
int cnss_bus_load_m3(struct cnss_plat_data *plat_priv); int cnss_bus_load_m3(struct cnss_plat_data *plat_priv);
int cnss_bus_alloc_fw_mem(struct cnss_plat_data *plat_priv); int cnss_bus_alloc_fw_mem(struct cnss_plat_data *plat_priv);
u32 cnss_bus_get_wake_irq(struct cnss_plat_data *plat_priv); int cnss_bus_get_wake_irq(struct cnss_plat_data *plat_priv);
int cnss_bus_force_fw_assert_hdlr(struct cnss_plat_data *plat_priv); int cnss_bus_force_fw_assert_hdlr(struct cnss_plat_data *plat_priv);
void cnss_bus_fw_boot_timeout_hdlr(unsigned long data); void cnss_bus_fw_boot_timeout_hdlr(unsigned long data);
void cnss_bus_collect_dump_info(struct cnss_plat_data *plat_priv); void cnss_bus_collect_dump_info(struct cnss_plat_data *plat_priv);

5
drivers/net/wireless/cnss2/qmi.c
View file

@ -164,8 +164,9 @@ static int cnss_wlfw_host_cap_send_sync(struct cnss_plat_data *plat_priv)
req.num_clients = daemon_support ? 2 : 1; req.num_clients = daemon_support ? 2 : 1;
cnss_pr_dbg("Number of clients is %d\n", req.num_clients); cnss_pr_dbg("Number of clients is %d\n", req.num_clients);
req.wake_msi = cnss_bus_get_wake_irq(plat_priv); ret = cnss_bus_get_wake_irq(plat_priv);
if (req.wake_msi) { if (ret > 0) {
req.wake_msi = ret;
cnss_pr_dbg("WAKE MSI base data is %d\n", req.wake_msi); cnss_pr_dbg("WAKE MSI base data is %d\n", req.wake_msi);
req.wake_msi_valid = 1; req.wake_msi_valid = 1;
} }