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

Commit 15df09cc authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Remove redundant checking from fw_ready_hdlr"

parents dee55dfa 972b7c76

drivers/net/wireless/cnss2/main.c

+13 −4
Original line number Diff line number Diff line
@@ -432,11 +432,8 @@ static int cnss_fw_ready_hdlr(struct cnss_plat_data *plat_priv) 
		cnss_request_antenna_sharing(plat_priv);

		ret = cnss_wlfw_wlan_mode_send_sync(plat_priv,

						    CNSS_CALIBRATION);

	} else if (test_bit(CNSS_DRIVER_LOADING, &plat_priv->driver_state) ||

		   test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state)) {

		ret = cnss_bus_call_driver_probe(plat_priv);

	} else {

		complete(&plat_priv->power_up_complete);

		ret = cnss_bus_call_driver_probe(plat_priv);

	}



	if (ret && test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state))
@@ -638,6 +635,18 @@ int cnss_power_down(struct device *dev) 
}

EXPORT_SYMBOL(cnss_power_down);



int cnss_idle_restart(struct device *dev)

{

	return 0;

}

EXPORT_SYMBOL(cnss_idle_restart);



int cnss_idle_shutdown(struct device *dev)

{

	return 0;

}

EXPORT_SYMBOL(cnss_idle_shutdown);



static int cnss_get_resources(struct cnss_plat_data *plat_priv)

{

	int ret = 0;

drivers/net/wireless/cnss2/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -442,6 +442,8 @@ int cnss_pci_call_driver_probe(struct cnss_pci_data *pci_priv) 
		clear_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state);

		clear_bit(CNSS_DRIVER_LOADING, &plat_priv->driver_state);

		set_bit(CNSS_DRIVER_PROBED, &plat_priv->driver_state);

	} else {

		complete(&plat_priv->power_up_complete);

	}



	return 0;

include/net/cnss2.h

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ struct cnss_wlan_driver { 
	char *name;

	int  (*probe)(struct pci_dev *pdev, const struct pci_device_id *id);

	void (*remove)(struct pci_dev *pdev);

	int (*idle_restart)(struct pci_dev *pdev,

			    const struct pci_device_id *id);

	int  (*idle_shutdown)(struct pci_dev *pdev);

	int  (*reinit)(struct pci_dev *pdev, const struct pci_device_id *id);

	void (*shutdown)(struct pci_dev *pdev);

	void (*crash_shutdown)(struct pci_dev *pdev);
@@ -175,6 +178,8 @@ extern int cnss_get_soc_info(struct device *dev, struct cnss_soc_info *info); 
extern int cnss_request_bus_bandwidth(struct device *dev, int bandwidth);

extern int cnss_power_up(struct device *dev);

extern int cnss_power_down(struct device *dev);

extern int cnss_idle_restart(struct device *dev);

extern int cnss_idle_shutdown(struct device *dev);

extern void cnss_request_pm_qos(struct device *dev, u32 qos_val);

extern void cnss_remove_pm_qos(struct device *dev);

extern void cnss_lock_pm_sem(struct device *dev);