mwifiex: get rid of mwifiex_do_flr wrapper (8750ab62) · Commits · 戴 / test

drivers/net/wireless/marvell/mwifiex/main.c

+5 −26

Original line number	Diff line number	Diff line
		@@ -1348,7 +1348,7 @@ static void mwifiex_main_work_queue(struct work_struct *work)
		* This function gets called during PCIe function level reset. Required
		* code is extracted from mwifiex_remove_card()
		*/
		static int
		int
		mwifiex_shutdown_sw(struct mwifiex_adapter *adapter)
		{
		struct mwifiex_private *priv;
		@@ -1417,13 +1417,13 @@ mwifiex_shutdown_sw(struct mwifiex_adapter *adapter)
		exit_return:
		return 0;
		}
		EXPORT_SYMBOL_GPL(mwifiex_shutdown_sw);

		/* This function gets called during PCIe function level reset. Required
		* code is extracted from mwifiex_add_card()
		*/
		static int
		mwifiex_reinit_sw(struct mwifiex_adapter adapter, struct completion fw_done,
		struct mwifiex_if_ops *if_ops, u8 iface_type)
		int
		mwifiex_reinit_sw(struct mwifiex_adapter *adapter)
		{
		char fw_name[32];
		struct pcie_service_card *card = adapter->card;
		@@ -1432,9 +1432,6 @@ mwifiex_reinit_sw(struct mwifiex_adapter adapter, struct completion fw_done,
		if (adapter->if_ops.up_dev)
		adapter->if_ops.up_dev(adapter);

		adapter->iface_type = iface_type;
		adapter->fw_done = fw_done;

		adapter->hw_status = MWIFIEX_HW_STATUS_INITIALIZING;
		adapter->surprise_removed = false;
		init_waitqueue_head(&adapter->init_wait_q);
		@@ -1507,25 +1504,7 @@ err_kmalloc:

		return -1;
		}

		/* This function processes pre and post PCIe function level resets.
		* It performs software cleanup without touching PCIe specific code.
		* Also, during initialization PCIe stuff is skipped.
		*/
		void mwifiex_do_flr(struct mwifiex_adapter *adapter, bool prepare)
		{
		struct mwifiex_if_ops if_ops;

		if (!prepare) {
		mwifiex_reinit_sw(adapter, adapter->fw_done, &if_ops,
		adapter->iface_type);
		} else {
		memcpy(&if_ops, &adapter->if_ops,
		sizeof(struct mwifiex_if_ops));
		mwifiex_shutdown_sw(adapter);
		}
		}
		EXPORT_SYMBOL_GPL(mwifiex_do_flr);
		EXPORT_SYMBOL_GPL(mwifiex_reinit_sw);

		static irqreturn_t mwifiex_irq_wakeup_handler(int irq, void *priv)
		{

drivers/net/wireless/marvell/mwifiex/main.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -1666,5 +1666,6 @@ void mwifiex_debugfs_remove(void);
		void mwifiex_dev_debugfs_init(struct mwifiex_private *priv);
		void mwifiex_dev_debugfs_remove(struct mwifiex_private *priv);
		#endif
		void mwifiex_do_flr(struct mwifiex_adapter *adapter, bool prepare);
		int mwifiex_reinit_sw(struct mwifiex_adapter *adapter);
		int mwifiex_shutdown_sw(struct mwifiex_adapter *adapter);
		#endif /* !_MWIFIEX_MAIN_H_ */

drivers/net/wireless/marvell/mwifiex/pcie.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -375,7 +375,7 @@ static void mwifiex_pcie_reset_notify(struct pci_dev *pdev, bool prepare)
		* Cleanup all software without cleaning anything related to
		* PCIe and HW.
		*/
		mwifiex_do_flr(adapter, prepare);
		mwifiex_shutdown_sw(adapter);
		adapter->surprise_removed = true;
		} else {
		/* Kernel stores and restores PCIe function context before and
		@@ -383,7 +383,7 @@ static void mwifiex_pcie_reset_notify(struct pci_dev *pdev, bool prepare)
		* and firmware including firmware redownload
		*/
		adapter->surprise_removed = false;
		mwifiex_do_flr(adapter, prepare);
		mwifiex_reinit_sw(adapter);
		}
		mwifiex_dbg(adapter, INFO, "%s, successful\n", __func__);
		}

Admin message