rtw88: pci: Add prototypes for .probe, .remove and .shutdown (2e86ef41) · Commits · 戴 / test

Also strip out other duplicates from driver specific headers. Ensure 'main.h' is explicitly included in 'pci.h' since the latter uses some defines from the former. It avoids issues like: from drivers/net/wireless/realtek/rtw88/rtw8822be.c:5: drivers/net/wireless/realtek/rtw88/pci.h:209:28: error: ‘RTK_MAX_TX_QUEUE_NUM’ undeclared here (not in a function); did you mean ‘RTK_MAX_RX_DESC_NUM’? 209 | DECLARE_BITMAP(tx_queued, RTK_MAX_TX_QUEUE_NUM); | ^~~~~~~~~~~~~~~~~~~~ Fixes the following W=1 kernel build warning(s): drivers/net/wireless/realtek/rtw88/pci.c:1488:5: warning: no previous prototype for ‘rtw_pci_probe’ [-Wmissing-prototypes] 1488 | int rtw_pci_probe(struct pci_dev *pdev, | ^~~~~~~~~~~~~ drivers/net/wireless/realtek/rtw88/pci.c:1568:6: warning: no previous prototype for ‘rtw_pci_remove’ [-Wmissing-prototypes] 1568 | void rtw_pci_remove(struct pci_dev *pdev) | ^~~~~~~~~~~~~~ drivers/net/wireless/realtek/rtw88/pci.c:1590:6: warning: no previous prototype for ‘rtw_pci_shutdown’ [-Wmissing-prototypes] 1590 | void rtw_pci_shutdown(struct pci_dev *pdev) | ^~~~~~~~~~~~~~~~ Cc: Yan-Hsuan Chuang <yhchuang@realtek.com> Cc: Kalle Valo <kvalo@codeaurora.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jakub Kicinski <kuba@kernel.org> Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by:

Lee Jones <lee.jones@linaro.org> Signed-off-by:

Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20201126133152.3211309-18-lee.jones@linaro.org

drivers/net/wireless/realtek/rtw88/pci.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@
		#ifndef __RTK_PCI_H_
		#define __RTK_PCI_H_

		#include "main.h"

		#define RTK_DEFAULT_TX_DESC_NUM 128
		#define RTK_BEQ_TX_DESC_NUM 256

		@@ -212,6 +214,12 @@ struct rtw_pci {
		void __iomem *mmap;
		};

		const struct dev_pm_ops rtw_pm_ops;

		int rtw_pci_probe(struct pci_dev pdev, const struct pci_device_id id);
		void rtw_pci_remove(struct pci_dev *pdev);
		void rtw_pci_shutdown(struct pci_dev *pdev);

		static inline u32 max_num_of_tx_queue(u8 queue)
		{
		u32 max_num;

drivers/net/wireless/realtek/rtw88/rtw8723de.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@

		#include <linux/module.h>
		#include <linux/pci.h>
		#include "pci.h"
		#include "rtw8723de.h"

		static const struct pci_device_id rtw_8723de_id_table[] = {

drivers/net/wireless/realtek/rtw88/rtw8723de.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -5,10 +5,6 @@
		#ifndef __RTW_8723DE_H_
		#define __RTW_8723DE_H_

		extern const struct dev_pm_ops rtw_pm_ops;
		extern struct rtw_chip_info rtw8723d_hw_spec;
		int rtw_pci_probe(struct pci_dev pdev, const struct pci_device_id id);
		void rtw_pci_remove(struct pci_dev *pdev);
		void rtw_pci_shutdown(struct pci_dev *pdev);

		#endif

drivers/net/wireless/realtek/rtw88/rtw8821ce.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@

		#include <linux/module.h>
		#include <linux/pci.h>
		#include "pci.h"
		#include "rtw8821ce.h"

		static const struct pci_device_id rtw_8821ce_id_table[] = {

drivers/net/wireless/realtek/rtw88/rtw8821ce.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -5,10 +5,6 @@
		#ifndef __RTW_8821CE_H_
		#define __RTW_8821CE_H_

		extern const struct dev_pm_ops rtw_pm_ops;
		extern struct rtw_chip_info rtw8821c_hw_spec;
		int rtw_pci_probe(struct pci_dev pdev, const struct pci_device_id id);
		void rtw_pci_remove(struct pci_dev *pdev);
		void rtw_pci_shutdown(struct pci_dev *pdev);

		#endif

Admin message