| Message ID | 20200408185413.218643-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7dc7c41607d192ff660ba4ea82d517745c1d7523 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | rtw88: avoid unused function warnings | expand |
Arnd Bergmann <arnd@arndb.de> writes: > The rtw88 driver defines emtpy functions with multiple indirections > but gets one of these wrong: > > drivers/net/wireless/realtek/rtw88/pci.c:1347:12: error: 'rtw_pci_resume' defined but not used [-Werror=unused-function] > 1347 | static int rtw_pci_resume(struct device *dev) > | ^~~~~~~~~~~~~~ > drivers/net/wireless/realtek/rtw88/pci.c:1342:12: error: 'rtw_pci_suspend' defined but not used [-Werror=unused-function] > 1342 | static int rtw_pci_suspend(struct device *dev) > > Better simplify it to rely on the conditional reference in > SIMPLE_DEV_PM_OPS(), and mark the functions as __maybe_unused to avoid > warning about it. > > I'm not sure if these are needed at all given that the functions > don't do anything, but they were only recently added. > > Fixes: 44bc17f7f5b3 ("rtw88: support wowlan feature for 8822c") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> I'll queue this to v5.7.
Arnd Bergmann <arnd@arndb.de> wrote: > The rtw88 driver defines emtpy functions with multiple indirections > but gets one of these wrong: > > drivers/net/wireless/realtek/rtw88/pci.c:1347:12: error: 'rtw_pci_resume' defined but not used [-Werror=unused-function] > 1347 | static int rtw_pci_resume(struct device *dev) > | ^~~~~~~~~~~~~~ > drivers/net/wireless/realtek/rtw88/pci.c:1342:12: error: 'rtw_pci_suspend' defined but not used [-Werror=unused-function] > 1342 | static int rtw_pci_suspend(struct device *dev) > > Better simplify it to rely on the conditional reference in > SIMPLE_DEV_PM_OPS(), and mark the functions as __maybe_unused to avoid > warning about it. > > I'm not sure if these are needed at all given that the functions > don't do anything, but they were only recently added. > > Fixes: 44bc17f7f5b3 ("rtw88: support wowlan feature for 8822c") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Patch applied to wireless-drivers.git, thanks. 7dc7c41607d1 rtw88: avoid unused function warnings
diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c index e37c71495c0d..1af87eb2e53a 100644 --- a/drivers/net/wireless/realtek/rtw88/pci.c +++ b/drivers/net/wireless/realtek/rtw88/pci.c @@ -1338,22 +1338,17 @@ static void rtw_pci_phy_cfg(struct rtw_dev *rtwdev) rtw_pci_link_cfg(rtwdev); } -#ifdef CONFIG_PM -static int rtw_pci_suspend(struct device *dev) +static int __maybe_unused rtw_pci_suspend(struct device *dev) { return 0; } -static int rtw_pci_resume(struct device *dev) +static int __maybe_unused rtw_pci_resume(struct device *dev) { return 0; } static SIMPLE_DEV_PM_OPS(rtw_pm_ops, rtw_pci_suspend, rtw_pci_resume); -#define RTW_PM_OPS (&rtw_pm_ops) -#else -#define RTW_PM_OPS NULL -#endif static int rtw_pci_claim(struct rtw_dev *rtwdev, struct pci_dev *pdev) { @@ -1582,7 +1577,7 @@ static struct pci_driver rtw_pci_driver = { .id_table = rtw_pci_id_table, .probe = rtw_pci_probe, .remove = rtw_pci_remove, - .driver.pm = RTW_PM_OPS, + .driver.pm = &rtw_pm_ops, }; module_pci_driver(rtw_pci_driver);
The rtw88 driver defines emtpy functions with multiple indirections but gets one of these wrong: drivers/net/wireless/realtek/rtw88/pci.c:1347:12: error: 'rtw_pci_resume' defined but not used [-Werror=unused-function] 1347 | static int rtw_pci_resume(struct device *dev) | ^~~~~~~~~~~~~~ drivers/net/wireless/realtek/rtw88/pci.c:1342:12: error: 'rtw_pci_suspend' defined but not used [-Werror=unused-function] 1342 | static int rtw_pci_suspend(struct device *dev) Better simplify it to rely on the conditional reference in SIMPLE_DEV_PM_OPS(), and mark the functions as __maybe_unused to avoid warning about it. I'm not sure if these are needed at all given that the functions don't do anything, but they were only recently added. Fixes: 44bc17f7f5b3 ("rtw88: support wowlan feature for 8822c") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/wireless/realtek/rtw88/pci.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)