mwifiex: get rid of global user_rmmod flag (045f0c1b) · Commits · 戴 / test

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

+12 −11

Original line number	Diff line number	Diff line
		@@ -31,8 +31,6 @@
		#define PCIE_VERSION "1.0"
		#define DRV_NAME "Marvell mwifiex PCIe"

		static u8 user_rmmod;

		static struct mwifiex_if_ops pcie_ops;

		static const struct of_device_id mwifiex_pcie_of_match_table[] = {
		@@ -284,6 +282,9 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
		struct pcie_service_card *card;
		struct mwifiex_adapter *adapter;
		struct mwifiex_private *priv;
		const struct mwifiex_pcie_card_reg *reg;
		u32 fw_status;
		int ret;

		card = pci_get_drvdata(pdev);

		@@ -295,7 +296,11 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)

		cancel_work_sync(&card->work);

		if (user_rmmod && !adapter->mfg_mode) {
		reg = card->pcie.reg;
		if (reg)
		ret = mwifiex_read_reg(adapter, reg->fw_status, &fw_status);

		if (fw_status == FIRMWARE_READY_PCIE && !adapter->mfg_mode) {
		mwifiex_deauthenticate_all(adapter);

		priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
		@@ -310,7 +315,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)

		static void mwifiex_pcie_shutdown(struct pci_dev *pdev)
		{
		user_rmmod = 1;
		mwifiex_pcie_remove(pdev);

		return;
		@@ -2874,8 +2878,11 @@ static void mwifiex_pcie_cleanup(struct mwifiex_adapter *adapter)
		struct pcie_service_card *card = adapter->card;
		struct pci_dev *pdev = card->dev;
		const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
		int ret;
		u32 fw_status;

		if (user_rmmod) {
		ret = mwifiex_read_reg(adapter, reg->fw_status, &fw_status);
		if (fw_status == FIRMWARE_READY_PCIE) {
		mwifiex_dbg(adapter, INFO,
		"Clearing driver ready signature\n");
		if (mwifiex_write_reg(adapter, reg->drv_rdy, 0x00000000))
		@@ -3187,9 +3194,6 @@ static int mwifiex_pcie_init_module(void)

		pr_debug("Marvell PCIe Driver\n");

		/* Clear the flag in case user removes the card. */
		user_rmmod = 0;

		ret = pci_register_driver(&mwifiex_pcie);
		if (ret)
		pr_err("Driver register failed!\n");
		@@ -3210,9 +3214,6 @@ static int mwifiex_pcie_init_module(void)
		*/
		static void mwifiex_pcie_cleanup_module(void)
		{
		/* Set the flag as user is removing this module. */
		user_rmmod = 1;

		pci_unregister_driver(&mwifiex_pcie);
		}

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

+4 −23

Original line number	Diff line number	Diff line
		@@ -31,21 +31,6 @@

		#define SDIO_VERSION "1.0"

		/* The mwifiex_sdio_remove() callback function is called when
		* user removes this module from kernel space or ejects
		* the card from the slot. The driver handles these 2 cases
		* differently.
		* If the user is removing the module, the few commands (FUNC_SHUTDOWN,
		* HS_CANCEL etc.) are sent to the firmware.
		* If the card is removed, there is no need to send these command.
		*
		* The variable 'user_rmmod' is used to distinguish these two
		* scenarios. This flag is initialized as FALSE in case the card
		* is removed, and will be set to TRUE for module removal when
		* module_exit function is called.
		*/
		static u8 user_rmmod;

		static void mwifiex_sdio_work(struct work_struct *work);
		static DECLARE_WORK(sdio_work, mwifiex_sdio_work);

		@@ -391,6 +376,8 @@ __mwifiex_sdio_remove(struct sdio_func *func)
		struct sdio_mmc_card *card;
		struct mwifiex_adapter *adapter;
		struct mwifiex_private *priv;
		int ret = 0;
		u16 firmware_stat;

		card = sdio_get_drvdata(func);
		if (!card)
		@@ -404,7 +391,8 @@ __mwifiex_sdio_remove(struct sdio_func *func)

		mwifiex_dbg(adapter, INFO, "info: SDIO func num=%d\n", func->num);

		if (user_rmmod && !adapter->mfg_mode) {
		ret = mwifiex_sdio_read_fw_status(adapter, &firmware_stat);
		if (firmware_stat == FIRMWARE_READY_SDIO && !adapter->mfg_mode) {
		mwifiex_deauthenticate_all(adapter);

		priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
		@@ -2724,9 +2712,6 @@ static struct mwifiex_if_ops sdio_ops = {
		static int
		mwifiex_sdio_init_module(void)
		{
		/* Clear the flag in case user removes the card. */
		user_rmmod = 0;

		return sdio_register_driver(&mwifiex_sdio);
		}

		@@ -2742,10 +2727,6 @@ mwifiex_sdio_init_module(void)
		static void
		mwifiex_sdio_cleanup_module(void)
		{
		/* Set the flag as user is removing this module. */
		user_rmmod = 1;
		cancel_work_sync(&sdio_work);

		sdio_unregister_driver(&mwifiex_sdio);
		}

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

+1 −5

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

		#define USB_VERSION "1.0"

		static u8 user_rmmod;
		static struct mwifiex_if_ops usb_ops;

		static struct usb_device_id mwifiex_usb_table[] = {
		@@ -618,7 +617,7 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf)
		if (!adapter \|\| !adapter->priv_num)
		return;

		if (user_rmmod && !adapter->mfg_mode) {
		if (card->udev->state != USB_STATE_NOTATTACHED && !adapter->mfg_mode) {
		mwifiex_deauthenticate_all(adapter);

		mwifiex_init_shutdown_fw(mwifiex_get_priv(adapter,
		@@ -1230,9 +1229,6 @@ static int mwifiex_usb_init_module(void)
		*/
		static void mwifiex_usb_cleanup_module(void)
		{
		/* set the flag as user is removing this module */
		user_rmmod = 1;

		usb_deregister(&mwifiex_usb_driver);
		}

Admin message