Commit c0e6aa42 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Kalle Valo
Browse files

mwifiex: use module_*_driver helper macros 



After user_rmmod global flag removal, *_init_module() and
*_cleanup_module() have become just a wrapper functions.
We will get rid of them with the help of module_*_driver() macros.

For pcie, existing ".init_if" handler has same name as what
module_pcie_driver() macro will create. Let's rename it to
avoid conflict.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 045f0c1b

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

+6 −41
Original line number Diff line number Diff line
@@ -2764,7 +2764,7 @@ static void mwifiex_pcie_device_dump(struct mwifiex_adapter *adapter) 
 *      - Allocate command response ring buffer

 *      - Allocate sleep cookie buffer

 */

static int mwifiex_pcie_init(struct mwifiex_adapter *adapter)

static int mwifiex_init_pcie(struct mwifiex_adapter *adapter)

{

	struct pcie_service_card *card = adapter->card;

	int ret;
@@ -2873,7 +2873,7 @@ err_enable_dev: 
 *      - Command response ring buffer

 *      - Sleep cookie buffer

 */

static void mwifiex_pcie_cleanup(struct mwifiex_adapter *adapter)

static void mwifiex_cleanup_pcie(struct mwifiex_adapter *adapter)

{

	struct pcie_service_card *card = adapter->card;

	struct pci_dev *pdev = card->dev;
@@ -3073,7 +3073,7 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter) 
 *      - Allocate event BD ring buffers

 *      - Allocate command response ring buffer

 *      - Allocate sleep cookie buffer

 * Part of mwifiex_pcie_init(), not reset the PCIE registers

 * Part of mwifiex_init_pcie(), not reset the PCIE registers

 */

static void mwifiex_pcie_up_dev(struct mwifiex_adapter *adapter)

{
@@ -3156,8 +3156,8 @@ static void mwifiex_pcie_down_dev(struct mwifiex_adapter *adapter) 
}



static struct mwifiex_if_ops pcie_ops = {

	.init_if =			mwifiex_pcie_init,

	.cleanup_if =			mwifiex_pcie_cleanup,

	.init_if =			mwifiex_init_pcie,

	.cleanup_if =			mwifiex_cleanup_pcie,

	.check_fw_status =		mwifiex_check_fw_status,

	.check_winner_status =          mwifiex_check_winner_status,

	.prog_fw =			mwifiex_prog_fw_w_helper,
@@ -3183,42 +3183,7 @@ static struct mwifiex_if_ops pcie_ops = { 
	.up_dev =			mwifiex_pcie_up_dev,

};



/*

 * This function initializes the PCIE driver module.

 *

 * This registers the device with PCIE bus.

 */

static int mwifiex_pcie_init_module(void)

{

	int ret;



	pr_debug("Marvell PCIe Driver\n");



	ret = pci_register_driver(&mwifiex_pcie);

	if (ret)

		pr_err("Driver register failed!\n");

	else

		pr_debug("info: Driver registered successfully!\n");



	return ret;

}



/*

 * This function cleans up the PCIE driver.

 *

 * The following major steps are followed for cleanup -

 *      - Resume the device if its suspended

 *      - Disconnect the device if connected

 *      - Shutdown the firmware

 *      - Unregister the device from PCIE bus.

 */

static void mwifiex_pcie_cleanup_module(void)

{

	pci_unregister_driver(&mwifiex_pcie);

}



module_init(mwifiex_pcie_init_module);

module_exit(mwifiex_pcie_cleanup_module);

module_pci_driver(mwifiex_pcie);



MODULE_AUTHOR("Marvell International Ltd.");

MODULE_DESCRIPTION("Marvell WiFi-Ex PCI-Express Driver version " PCIE_VERSION);

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

+1 −28
Original line number Diff line number Diff line
@@ -2704,34 +2704,7 @@ static struct mwifiex_if_ops sdio_ops = { 
	.deaggr_pkt = mwifiex_deaggr_sdio_pkt,

};



/*

 * This function initializes the SDIO driver.

 *

 * This registers the device with SDIO bus.

 */

static int

mwifiex_sdio_init_module(void)

{

	return sdio_register_driver(&mwifiex_sdio);

}



/*

 * This function cleans up the SDIO driver.

 *

 * The following major steps are followed for cleanup -

 *      - Resume the device if its suspended

 *      - Disconnect the device if connected

 *      - Shutdown the firmware

 *      - Unregister the device from SDIO bus.

 */

static void

mwifiex_sdio_cleanup_module(void)

{

	sdio_unregister_driver(&mwifiex_sdio);

}



module_init(mwifiex_sdio_init_module);

module_exit(mwifiex_sdio_cleanup_module);

module_driver(mwifiex_sdio, sdio_register_driver, sdio_unregister_driver);



MODULE_AUTHOR("Marvell International Ltd.");

MODULE_DESCRIPTION("Marvell WiFi-Ex SDIO Driver version " SDIO_VERSION);

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

+1 −34
Original line number Diff line number Diff line
@@ -1200,40 +1200,7 @@ static struct mwifiex_if_ops usb_ops = { 
	.is_port_ready =	mwifiex_usb_is_port_ready,

};



/* This function initializes the USB driver module.

 *

 * This registers the device with USB bus.

 */

static int mwifiex_usb_init_module(void)

{

	int ret;



	pr_debug("Marvell USB8797 Driver\n");



	ret = usb_register(&mwifiex_usb_driver);

	if (ret)

		pr_err("Driver register failed!\n");

	else

		pr_debug("info: Driver registered successfully!\n");



	return ret;

}



/* This function cleans up the USB driver.

 *

 * The following major steps are followed in .disconnect for cleanup:

 *      - Resume the device if its suspended

 *      - Disconnect the device if connected

 *      - Shutdown the firmware

 *      - Unregister the device from USB bus.

 */

static void mwifiex_usb_cleanup_module(void)

{

	usb_deregister(&mwifiex_usb_driver);

}



module_init(mwifiex_usb_init_module);

module_exit(mwifiex_usb_cleanup_module);

module_usb_driver(mwifiex_usb_driver);



MODULE_AUTHOR("Marvell International Ltd.");

MODULE_DESCRIPTION("Marvell WiFi-Ex USB Driver version" USB_VERSION);

CRA Git | Maintained and supported by SUSTech CRA and CCSE