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

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

Merge "cnss2: Request runtime PM resume when shutdown happens"

parents 1682bdfd b15e41e0

drivers/net/wireless/cnss2/main.c

+4 −0
Original line number Diff line number Diff line
@@ -1043,6 +1043,8 @@ static int cnss_qca6174_shutdown(struct cnss_plat_data *plat_priv) 
	if (!pci_priv)

		return -ENODEV;



	cnss_pm_request_resume(pci_priv);



	cnss_driver_call_remove(plat_priv);



	cnss_request_bus_bandwidth(CNSS_BUS_WIDTH_NONE);
@@ -1141,6 +1143,8 @@ static int cnss_qca6290_shutdown(struct cnss_plat_data *plat_priv) 
	if (!pci_priv)

		return -ENODEV;



	cnss_pm_request_resume(pci_priv);



	cnss_driver_call_remove(plat_priv);



	cnss_request_bus_bandwidth(CNSS_BUS_WIDTH_NONE);

drivers/net/wireless/cnss2/pci.c

+14 −0
Original line number Diff line number Diff line
@@ -668,6 +668,20 @@ out: 
}

EXPORT_SYMBOL(cnss_auto_resume);



int cnss_pm_request_resume(struct cnss_pci_data *pci_priv)

{

	struct pci_dev *pci_dev;



	if (!pci_priv)

		return -ENODEV;



	pci_dev = pci_priv->pci_dev;

	if (!pci_dev)

		return -ENODEV;



	return pm_request_resume(&pci_dev->dev);

}



int cnss_pci_alloc_fw_mem(struct cnss_pci_data *pci_priv)

{

	struct cnss_plat_data *plat_priv = pci_priv->plat_priv;

drivers/net/wireless/cnss2/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -138,5 +138,6 @@ int cnss_pci_start_mhi(struct cnss_pci_data *pci_priv); 
void cnss_pci_stop_mhi(struct cnss_pci_data *pci_priv);

void cnss_pci_collect_dump_info(struct cnss_pci_data *pci_priv);

void cnss_pci_clear_dump_info(struct cnss_pci_data *pci_priv);

int cnss_pm_request_resume(struct cnss_pci_data *pci_priv);



#endif /* _CNSS_PCI_H */