From 1a65e204961969fa967a9aed6e8bab5d9ac66717 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:19:34 -0500 Subject: [PATCH] staging: wlags49_h2: remove use of __devexit_p CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed, remove it. This also changes the syntax for the initialization of the wl_driver struct to match convention. Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlags49_h2/wl_pci.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index a09c3ac793a2..687b29895d45 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c @@ -160,14 +160,13 @@ void wl_pci_dma_hcf_reclaim_rx( struct wl_private *lp ); /******************************************************************************* * PCI module function registration ******************************************************************************/ -static struct pci_driver wl_driver = -{ - name: MODULE_NAME, - id_table: wl_pci_tbl, - probe: wl_pci_probe, - remove: __devexit_p(wl_pci_remove), - suspend: NULL, - resume: NULL, +static struct pci_driver wl_driver = { + .name = MODULE_NAME, + .id_table = wl_pci_tbl, + .probe = wl_pci_probe, + .remove = wl_pci_remove, + .suspend = NULL, + .resume = NULL }; /*******************************************************************************