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

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

Merge "cnss2: Remove deprecated wake_event"

parents 9079b45e 5542d684

drivers/net/wireless/cnss2/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -1216,8 +1216,6 @@ static void cnss_pci_handle_linkdown(struct cnss_pci_data *pci_priv) 
	pci_priv->pci_link_down_ind = true;

	spin_unlock_irqrestore(&pci_link_down_lock, flags);



	reinit_completion(&pci_priv->wake_event);



	if (pci_dev->device == QCA6174_DEVICE_ID)

		disable_irq(pci_dev->irq);
@@ -2914,7 +2912,6 @@ static void cnss_pci_event_cb(struct msm_pcie_notify *notify) 
		cnss_pci_handle_linkdown(pci_priv);

		break;

	case MSM_PCIE_EVENT_WAKEUP:

		complete(&pci_priv->wake_event);

		if ((cnss_pci_get_monitor_wake_intr(pci_priv) &&

		     cnss_pci_get_auto_suspended(pci_priv)) ||

		     dev->power.runtime_status == RPM_SUSPENDING) {
@@ -5375,7 +5372,6 @@ static irqreturn_t cnss_pci_wake_handler(int irq, void *data) 
	 */

	pm_system_wakeup();



	complete(&pci_priv->wake_event);

	if (cnss_pci_get_monitor_wake_intr(pci_priv) &&

	    cnss_pci_get_auto_suspended(pci_priv)) {

		cnss_pci_set_monitor_wake_intr(pci_priv, false);
@@ -5592,7 +5588,6 @@ static int cnss_pci_probe(struct pci_dev *pci_dev, 
		cnss_pci_set_wlaon_pwr_ctrl(pci_priv, false, false, false);

		timer_setup(&pci_priv->dev_rddm_timer,

			    cnss_dev_rddm_timeout_hdlr, 0);

		init_completion(&pci_priv->wake_event);

		INIT_DELAYED_WORK(&pci_priv->time_sync_work,

				  cnss_pci_time_sync_work_hdlr);

		cnss_pci_get_link_status(pci_priv);
@@ -5652,7 +5647,6 @@ static void cnss_pci_remove(struct pci_dev *pci_dev) 
	case QCA6490_DEVICE_ID:

	case WCN7850_DEVICE_ID:

		cnss_pci_wake_gpio_deinit(pci_priv);

		complete_all(&pci_priv->wake_event);

		del_timer(&pci_priv->dev_rddm_timer);

		break;

	default:

drivers/net/wireless/cnss2/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ struct cnss_pci_data { 
	int wake_gpio;

	int wake_irq;

	u32 wake_counter;

	struct completion wake_event;

	u8 monitor_wake_intr;

	struct iommu_domain *iommu_domain;

	u8 smmu_s1_enable;