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

Commit 203dab83 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kalle Valo
Browse files

wil6210: fix build warnings without CONFIG_PM 



The #ifdef checks are hard to get right, in this case some functions
should have been left inside a CONFIG_PM_SLEEP check as seen by this
message:

drivers/net/wireless/ath/wil6210/pcie_bus.c:489:12: error: 'wil6210_pm_resume' defined but not used [-Werror=unused-function]
drivers/net/wireless/ath/wil6210/pcie_bus.c:484:12: error: 'wil6210_pm_suspend' defined but not used [-Werror=unused-function]

Using an __maybe_unused is easier here, so I'm replacing all the
other #ifdef in this file as well for consistency.

Fixes: 94162666 ("wil6210: run-time PM when interface down")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent a0709dfd

drivers/net/wireless/ath/wil6210/pcie_bus.c

+8 −17
Original line number Diff line number Diff line
@@ -31,10 +31,8 @@ static bool ftm_mode; 
module_param(ftm_mode, bool, 0444);

MODULE_PARM_DESC(ftm_mode, " Set factory test mode, default - false");



#ifdef CONFIG_PM

static int wil6210_pm_notify(struct notifier_block *notify_block,

			     unsigned long mode, void *unused);

#endif /* CONFIG_PM */



static

void wil_set_capabilities(struct wil6210_priv *wil)
@@ -307,15 +305,15 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto bus_disable;

	}



#ifdef CONFIG_PM

	if (IS_ENABLED(CONFIG_PM))

		wil->pm_notify.notifier_call = wil6210_pm_notify;



	rc = register_pm_notifier(&wil->pm_notify);

	if (rc)

		/* Do not fail the driver initialization, as suspend can

		 * be prevented in a later phase if needed

		 */

		wil_err(wil, "register_pm_notifier failed: %d\n", rc);

#endif /* CONFIG_PM */



	wil6210_debugfs_init(wil);
@@ -346,9 +344,7 @@ static void wil_pcie_remove(struct pci_dev *pdev) 


	wil_dbg_misc(wil, "pcie_remove\n");



#ifdef CONFIG_PM

	unregister_pm_notifier(&wil->pm_notify);

#endif /* CONFIG_PM */



	wil_pm_runtime_forbid(wil);
@@ -372,8 +368,6 @@ static const struct pci_device_id wil6210_pcie_ids[] = { 
};

MODULE_DEVICE_TABLE(pci, wil6210_pcie_ids);



#ifdef CONFIG_PM



static int wil6210_suspend(struct device *dev, bool is_runtime)

{

	int rc = 0;
@@ -481,17 +475,17 @@ static int wil6210_pm_notify(struct notifier_block *notify_block, 
	return rc;

}



static int wil6210_pm_suspend(struct device *dev)

static int __maybe_unused wil6210_pm_suspend(struct device *dev)

{

	return wil6210_suspend(dev, false);

}



static int wil6210_pm_resume(struct device *dev)

static int __maybe_unused wil6210_pm_resume(struct device *dev)

{

	return wil6210_resume(dev, false);

}



static int wil6210_pm_runtime_idle(struct device *dev)

static int __maybe_unused wil6210_pm_runtime_idle(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct wil6210_priv *wil = pci_get_drvdata(pdev);
@@ -501,12 +495,12 @@ static int wil6210_pm_runtime_idle(struct device *dev) 
	return wil_can_suspend(wil, true);

}



static int wil6210_pm_runtime_resume(struct device *dev)

static int __maybe_unused wil6210_pm_runtime_resume(struct device *dev)

{

	return wil6210_resume(dev, true);

}



static int wil6210_pm_runtime_suspend(struct device *dev)

static int __maybe_unused wil6210_pm_runtime_suspend(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct wil6210_priv *wil = pci_get_drvdata(pdev);
@@ -518,15 +512,12 @@ static int wil6210_pm_runtime_suspend(struct device *dev) 


	return wil6210_suspend(dev, true);

}

#endif /* CONFIG_PM */



static const struct dev_pm_ops wil6210_pm_ops = {

#ifdef CONFIG_PM

	SET_SYSTEM_SLEEP_PM_OPS(wil6210_pm_suspend, wil6210_pm_resume)

	SET_RUNTIME_PM_OPS(wil6210_pm_runtime_suspend,

			   wil6210_pm_runtime_resume,

			   wil6210_pm_runtime_idle)

#endif /* CONFIG_PM */

};



static struct pci_driver wil6210_driver = {

drivers/net/wireless/ath/wil6210/wil6210.h

+0 −2
Original line number Diff line number Diff line
@@ -742,9 +742,7 @@ struct wil6210_priv { 


	int fw_calib_result;



#ifdef CONFIG_PM

	struct notifier_block pm_notify;

#endif /* CONFIG_PM */



	bool suspend_resp_rcvd;

	bool suspend_resp_comp;