Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 910be1ab authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by David S. Miller
Browse files

neterion: s2io: Use module_pci_driver 



Use module_pci_driver for drivers whose init and exit functions
only register and unregister, respectively.

A simplified version of the Coccinelle semantic patch that performs
this transformation is as follows:

@a@
identifier f, x;
@@
-static f(...) { return pci_register_driver(&x); }

@b depends on a@
identifier e, a.x;
statement S;
@@
-static e(...) {
-pci_unregister_driver(&x);
-DBG_PRINT(INIT_DBG,"S");
- }

@c depends on a && b@
identifier a.f;
declarer name module_init;
@@
-module_init(f);

@d depends on a && b && c@
identifier b.e, a.x;
declarer name module_exit;
declarer name module_pci_driver;
@@
-module_exit(e);
+module_pci_driver(x);

Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71d3c0b4

drivers/net/ethernet/neterion/s2io.c

+1 −25
Original line number Diff line number Diff line
@@ -8226,31 +8226,7 @@ static void s2io_rem_nic(struct pci_dev *pdev) 
	pci_disable_device(pdev);

}



/**

 * s2io_starter - Entry point for the driver

 * Description: This function is the entry point for the driver. It verifies

 * the module loadable parameters and initializes PCI configuration space.

 */



static int __init s2io_starter(void)

{

	return pci_register_driver(&s2io_driver);

}



/**

 * s2io_closer - Cleanup routine for the driver

 * Description: This function is the cleanup routine for the driver. It

 * unregisters the driver.

 */



static __exit void s2io_closer(void)

{

	pci_unregister_driver(&s2io_driver);

	DBG_PRINT(INIT_DBG, "cleanup done\n");

}



module_init(s2io_starter);

module_exit(s2io_closer);

module_pci_driver(s2io_driver);



static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,

				struct tcphdr **tcp, struct RxD_t *rxdp,

drivers/net/ethernet/neterion/s2io.h

+0 −2
Original line number Diff line number Diff line
@@ -1085,8 +1085,6 @@ static void s2io_txpic_intr_handle(struct s2io_nic *sp); 
static void tx_intr_handler(struct fifo_info *fifo_data);

static void s2io_handle_errors(void * dev_id);



static int s2io_starter(void);

static void s2io_closer(void);

static void s2io_tx_watchdog(struct net_device *dev);

static void s2io_set_multicast(struct net_device *dev);

static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp);