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

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

Merge "cnss2: cnss_bus_get_wake_irq should return int"

parents 3fcf8453 e268d7d6

drivers/net/wireless/cnss2/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

		return -ENODEV;

drivers/net/wireless/cnss2/bus.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int cnss_bus_init(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_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);

void cnss_bus_fw_boot_timeout_hdlr(unsigned long data);

void cnss_bus_collect_dump_info(struct cnss_plat_data *plat_priv);

drivers/net/wireless/cnss2/qmi.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

	cnss_pr_dbg("Number of clients is %d\n", req.num_clients);



	req.wake_msi = cnss_bus_get_wake_irq(plat_priv);

	if (req.wake_msi) {

	ret = cnss_bus_get_wake_irq(plat_priv);

	if (ret > 0) {

		req.wake_msi = ret;

		cnss_pr_dbg("WAKE MSI base data is %d\n", req.wake_msi);

		req.wake_msi_valid = 1;

	}