提交 fb4e98ab 编写于 作者: B Bill Pemberton 提交者: Greg Kroah-Hartman

usb: remove use of __devexit

CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.
Signed-off-by: NBill Pemberton <wfp5p@virginia.edu>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Acked-by: NFelipe Balbi <balbi@ti.com>
Cc: Li Yang <leoli@freescale.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 2f82686e
...@@ -191,7 +191,7 @@ static int c67x00_drv_probe(struct platform_device *pdev) ...@@ -191,7 +191,7 @@ static int c67x00_drv_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit c67x00_drv_remove(struct platform_device *pdev) static int c67x00_drv_remove(struct platform_device *pdev)
{ {
struct c67x00_device *c67x00 = platform_get_drvdata(pdev); struct c67x00_device *c67x00 = platform_get_drvdata(pdev);
struct resource *res; struct resource *res;
......
...@@ -220,7 +220,7 @@ static int ci13xxx_imx_probe(struct platform_device *pdev) ...@@ -220,7 +220,7 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit ci13xxx_imx_remove(struct platform_device *pdev) static int ci13xxx_imx_remove(struct platform_device *pdev)
{ {
struct ci13xxx_imx_data *data = platform_get_drvdata(pdev); struct ci13xxx_imx_data *data = platform_get_drvdata(pdev);
......
...@@ -77,7 +77,7 @@ static int ci13xxx_msm_probe(struct platform_device *pdev) ...@@ -77,7 +77,7 @@ static int ci13xxx_msm_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit ci13xxx_msm_remove(struct platform_device *pdev) static int ci13xxx_msm_remove(struct platform_device *pdev)
{ {
struct platform_device *plat_ci = platform_get_drvdata(pdev); struct platform_device *plat_ci = platform_get_drvdata(pdev);
......
...@@ -107,7 +107,7 @@ static int ci13xxx_pci_probe(struct pci_dev *pdev, ...@@ -107,7 +107,7 @@ static int ci13xxx_pci_probe(struct pci_dev *pdev,
* first invoking the udc_remove() and then releases * first invoking the udc_remove() and then releases
* all PCI resources allocated for this USB device controller * all PCI resources allocated for this USB device controller
*/ */
static void __devexit ci13xxx_pci_remove(struct pci_dev *pdev) static void ci13xxx_pci_remove(struct pci_dev *pdev)
{ {
struct platform_device *plat_ci = pci_get_drvdata(pdev); struct platform_device *plat_ci = pci_get_drvdata(pdev);
......
...@@ -508,7 +508,7 @@ static int ci_hdrc_probe(struct platform_device *pdev) ...@@ -508,7 +508,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit ci_hdrc_remove(struct platform_device *pdev) static int ci_hdrc_remove(struct platform_device *pdev)
{ {
struct ci13xxx *ci = platform_get_drvdata(pdev); struct ci13xxx *ci = platform_get_drvdata(pdev);
......
...@@ -127,7 +127,7 @@ static int usbmisc_imx6q_probe(struct platform_device *pdev) ...@@ -127,7 +127,7 @@ static int usbmisc_imx6q_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit usbmisc_imx6q_remove(struct platform_device *pdev) static int usbmisc_imx6q_remove(struct platform_device *pdev)
{ {
usbmisc_unset_ops(&imx6q_usbmisc_ops); usbmisc_unset_ops(&imx6q_usbmisc_ops);
clk_disable_unprepare(usbmisc->clk); clk_disable_unprepare(usbmisc->clk);
......
...@@ -547,7 +547,7 @@ static int dwc3_probe(struct platform_device *pdev) ...@@ -547,7 +547,7 @@ static int dwc3_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit dwc3_remove(struct platform_device *pdev) static int dwc3_remove(struct platform_device *pdev)
{ {
struct dwc3 *dwc = platform_get_drvdata(pdev); struct dwc3 *dwc = platform_get_drvdata(pdev);
struct resource *res; struct resource *res;
......
...@@ -703,7 +703,7 @@ int dwc3_debugfs_init(struct dwc3 *dwc) ...@@ -703,7 +703,7 @@ int dwc3_debugfs_init(struct dwc3 *dwc)
return ret; return ret;
} }
void __devexit dwc3_debugfs_exit(struct dwc3 *dwc) void dwc3_debugfs_exit(struct dwc3 *dwc)
{ {
debugfs_remove_recursive(dwc->root); debugfs_remove_recursive(dwc->root);
dwc->root = NULL; dwc->root = NULL;
......
...@@ -170,7 +170,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev) ...@@ -170,7 +170,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit dwc3_exynos_remove(struct platform_device *pdev) static int dwc3_exynos_remove(struct platform_device *pdev)
{ {
struct dwc3_exynos *exynos = platform_get_drvdata(pdev); struct dwc3_exynos *exynos = platform_get_drvdata(pdev);
......
...@@ -421,7 +421,7 @@ static int dwc3_omap_probe(struct platform_device *pdev) ...@@ -421,7 +421,7 @@ static int dwc3_omap_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit dwc3_omap_remove(struct platform_device *pdev) static int dwc3_omap_remove(struct platform_device *pdev)
{ {
struct dwc3_omap *omap = platform_get_drvdata(pdev); struct dwc3_omap *omap = platform_get_drvdata(pdev);
......
...@@ -194,7 +194,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, ...@@ -194,7 +194,7 @@ static int dwc3_pci_probe(struct pci_dev *pci,
return ret; return ret;
} }
static void __devexit dwc3_pci_remove(struct pci_dev *pci) static void dwc3_pci_remove(struct pci_dev *pci)
{ {
struct dwc3_pci *glue = pci_get_drvdata(pci); struct dwc3_pci *glue = pci_get_drvdata(pci);
......
...@@ -2433,7 +2433,7 @@ static int bcm63xx_udc_probe(struct platform_device *pdev) ...@@ -2433,7 +2433,7 @@ static int bcm63xx_udc_probe(struct platform_device *pdev)
* bcm63xx_udc_remove - Remove the device from the system. * bcm63xx_udc_remove - Remove the device from the system.
* @pdev: Platform device struct from the bcm63xx BSP code. * @pdev: Platform device struct from the bcm63xx BSP code.
*/ */
static int __devexit bcm63xx_udc_remove(struct platform_device *pdev) static int bcm63xx_udc_remove(struct platform_device *pdev)
{ {
struct bcm63xx_udc *udc = platform_get_drvdata(pdev); struct bcm63xx_udc *udc = platform_get_drvdata(pdev);
......
...@@ -2651,7 +2651,7 @@ static int qe_udc_resume(struct platform_device *dev) ...@@ -2651,7 +2651,7 @@ static int qe_udc_resume(struct platform_device *dev)
} }
#endif #endif
static int __devexit qe_udc_remove(struct platform_device *ofdev) static int qe_udc_remove(struct platform_device *ofdev)
{ {
struct qe_udc *udc = dev_get_drvdata(&ofdev->dev); struct qe_udc *udc = dev_get_drvdata(&ofdev->dev);
struct qe_ep *ep; struct qe_ep *ep;
......
...@@ -203,7 +203,7 @@ static int __init hidg_plat_driver_probe(struct platform_device *pdev) ...@@ -203,7 +203,7 @@ static int __init hidg_plat_driver_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit hidg_plat_driver_remove(struct platform_device *pdev) static int hidg_plat_driver_remove(struct platform_device *pdev)
{ {
struct hidg_func_node *e, *n; struct hidg_func_node *e, *n;
......
...@@ -3352,7 +3352,7 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev) ...@@ -3352,7 +3352,7 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)
return retval; return retval;
} }
static int __devexit lpc32xx_udc_remove(struct platform_device *pdev) static int lpc32xx_udc_remove(struct platform_device *pdev)
{ {
struct lpc32xx_udc *udc = platform_get_drvdata(pdev); struct lpc32xx_udc *udc = platform_get_drvdata(pdev);
......
...@@ -1763,7 +1763,7 @@ static void mv_u3d_gadget_release(struct device *dev) ...@@ -1763,7 +1763,7 @@ static void mv_u3d_gadget_release(struct device *dev)
dev_dbg(dev, "%s\n", __func__); dev_dbg(dev, "%s\n", __func__);
} }
static __devexit int mv_u3d_remove(struct platform_device *dev) static int mv_u3d_remove(struct platform_device *dev)
{ {
struct mv_u3d *u3d = platform_get_drvdata(dev); struct mv_u3d *u3d = platform_get_drvdata(dev);
......
...@@ -2128,7 +2128,7 @@ static void gadget_release(struct device *_dev) ...@@ -2128,7 +2128,7 @@ static void gadget_release(struct device *_dev)
complete(udc->done); complete(udc->done);
} }
static int __devexit mv_udc_remove(struct platform_device *dev) static int mv_udc_remove(struct platform_device *dev)
{ {
struct mv_udc *udc = the_controller; struct mv_udc *udc = the_controller;
int clk_i; int clk_i;
......
...@@ -2193,7 +2193,7 @@ net2272_gadget_release(struct device *_dev) ...@@ -2193,7 +2193,7 @@ net2272_gadget_release(struct device *_dev)
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void __devexit static void
net2272_remove(struct net2272 *dev) net2272_remove(struct net2272 *dev)
{ {
usb_del_gadget_udc(&dev->gadget); usb_del_gadget_udc(&dev->gadget);
...@@ -2488,7 +2488,7 @@ net2272_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2488,7 +2488,7 @@ net2272_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return ret; return ret;
} }
static void __devexit static void
net2272_rdk1_remove(struct pci_dev *pdev, struct net2272 *dev) net2272_rdk1_remove(struct pci_dev *pdev, struct net2272 *dev)
{ {
int i; int i;
...@@ -2510,7 +2510,7 @@ net2272_rdk1_remove(struct pci_dev *pdev, struct net2272 *dev) ...@@ -2510,7 +2510,7 @@ net2272_rdk1_remove(struct pci_dev *pdev, struct net2272 *dev)
} }
} }
static void __devexit static void
net2272_rdk2_remove(struct pci_dev *pdev, struct net2272 *dev) net2272_rdk2_remove(struct pci_dev *pdev, struct net2272 *dev)
{ {
int i; int i;
...@@ -2529,7 +2529,7 @@ net2272_rdk2_remove(struct pci_dev *pdev, struct net2272 *dev) ...@@ -2529,7 +2529,7 @@ net2272_rdk2_remove(struct pci_dev *pdev, struct net2272 *dev)
pci_resource_len(pdev, i)); pci_resource_len(pdev, i));
} }
static void __devexit static void
net2272_pci_remove(struct pci_dev *pdev) net2272_pci_remove(struct pci_dev *pdev)
{ {
struct net2272 *dev = pci_get_drvdata(pdev); struct net2272 *dev = pci_get_drvdata(pdev);
...@@ -2660,7 +2660,7 @@ net2272_plat_probe(struct platform_device *pdev) ...@@ -2660,7 +2660,7 @@ net2272_plat_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit static int
net2272_plat_remove(struct platform_device *pdev) net2272_plat_remove(struct platform_device *pdev)
{ {
struct net2272 *dev = platform_get_drvdata(pdev); struct net2272 *dev = platform_get_drvdata(pdev);
......
...@@ -2974,7 +2974,7 @@ static int omap_udc_probe(struct platform_device *pdev) ...@@ -2974,7 +2974,7 @@ static int omap_udc_probe(struct platform_device *pdev)
return status; return status;
} }
static int __devexit omap_udc_remove(struct platform_device *pdev) static int omap_udc_remove(struct platform_device *pdev)
{ {
DECLARE_COMPLETION_ONSTACK(done); DECLARE_COMPLETION_ONSTACK(done);
......
...@@ -3460,7 +3460,7 @@ static void s3c_hsotg_create_debug(struct s3c_hsotg *hsotg) ...@@ -3460,7 +3460,7 @@ static void s3c_hsotg_create_debug(struct s3c_hsotg *hsotg)
* *
* Cleanup (remove) the debugfs files for use on module exit. * Cleanup (remove) the debugfs files for use on module exit.
*/ */
static void __devexit s3c_hsotg_delete_debug(struct s3c_hsotg *hsotg) static void s3c_hsotg_delete_debug(struct s3c_hsotg *hsotg)
{ {
unsigned epidx; unsigned epidx;
...@@ -3675,7 +3675,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev) ...@@ -3675,7 +3675,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
* s3c_hsotg_remove - remove function for hsotg driver * s3c_hsotg_remove - remove function for hsotg driver
* @pdev: The platform information for the driver * @pdev: The platform information for the driver
*/ */
static int __devexit s3c_hsotg_remove(struct platform_device *pdev) static int s3c_hsotg_remove(struct platform_device *pdev)
{ {
struct s3c_hsotg *hsotg = platform_get_drvdata(pdev); struct s3c_hsotg *hsotg = platform_get_drvdata(pdev);
......
...@@ -265,7 +265,7 @@ static int bcma_hcd_probe(struct bcma_device *dev) ...@@ -265,7 +265,7 @@ static int bcma_hcd_probe(struct bcma_device *dev)
return err; return err;
} }
static void __devexit bcma_hcd_remove(struct bcma_device *dev) static void bcma_hcd_remove(struct bcma_device *dev)
{ {
struct bcma_hcd_device *usb_dev = bcma_get_drvdata(dev); struct bcma_hcd_device *usb_dev = bcma_get_drvdata(dev);
struct platform_device *ohci_dev = usb_dev->ohci_dev; struct platform_device *ohci_dev = usb_dev->ohci_dev;
......
...@@ -182,7 +182,7 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev) ...@@ -182,7 +182,7 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev)
return retval; return retval;
} }
static int __devexit ehci_atmel_drv_remove(struct platform_device *pdev) static int ehci_atmel_drv_remove(struct platform_device *pdev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = platform_get_drvdata(pdev);
......
...@@ -173,7 +173,7 @@ static int ehci_msm_probe(struct platform_device *pdev) ...@@ -173,7 +173,7 @@ static int ehci_msm_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit ehci_msm_remove(struct platform_device *pdev) static int ehci_msm_remove(struct platform_device *pdev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = platform_get_drvdata(pdev);
......
...@@ -126,7 +126,7 @@ static int ehci_platform_probe(struct platform_device *dev) ...@@ -126,7 +126,7 @@ static int ehci_platform_probe(struct platform_device *dev)
return err; return err;
} }
static int __devexit ehci_platform_remove(struct platform_device *dev) static int ehci_platform_remove(struct platform_device *dev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_hcd *hcd = platform_get_drvdata(dev);
struct usb_ehci_pdata *pdata = dev->dev.platform_data; struct usb_ehci_pdata *pdata = dev->dev.platform_data;
......
...@@ -189,7 +189,7 @@ static int s5p_ehci_probe(struct platform_device *pdev) ...@@ -189,7 +189,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit s5p_ehci_remove(struct platform_device *pdev) static int s5p_ehci_remove(struct platform_device *pdev)
{ {
struct s5p_ehci_platdata *pdata = pdev->dev.platform_data; struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;
struct s5p_ehci_hcd *s5p_ehci = platform_get_drvdata(pdev); struct s5p_ehci_hcd *s5p_ehci = platform_get_drvdata(pdev);
......
...@@ -155,7 +155,7 @@ static int ehci_w90x900_probe(struct platform_device *pdev) ...@@ -155,7 +155,7 @@ static int ehci_w90x900_probe(struct platform_device *pdev)
return usb_w90x900_probe(&ehci_w90x900_hc_driver, pdev); return usb_w90x900_probe(&ehci_w90x900_hc_driver, pdev);
} }
static int __devexit ehci_w90x900_remove(struct platform_device *pdev) static int ehci_w90x900_remove(struct platform_device *pdev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = platform_get_drvdata(pdev);
......
...@@ -780,7 +780,7 @@ static int of_fhci_probe(struct platform_device *ofdev) ...@@ -780,7 +780,7 @@ static int of_fhci_probe(struct platform_device *ofdev)
return ret; return ret;
} }
static int __devexit fhci_remove(struct device *dev) static int fhci_remove(struct device *dev)
{ {
struct usb_hcd *hcd = dev_get_drvdata(dev); struct usb_hcd *hcd = dev_get_drvdata(dev);
struct fhci_hcd *fhci = hcd_to_fhci(hcd); struct fhci_hcd *fhci = hcd_to_fhci(hcd);
...@@ -803,7 +803,7 @@ static int __devexit fhci_remove(struct device *dev) ...@@ -803,7 +803,7 @@ static int __devexit fhci_remove(struct device *dev)
return 0; return 0;
} }
static int __devexit of_fhci_remove(struct platform_device *ofdev) static int of_fhci_remove(struct platform_device *ofdev)
{ {
return fhci_remove(&ofdev->dev); return fhci_remove(&ofdev->dev);
} }
......
...@@ -224,13 +224,13 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev) ...@@ -224,13 +224,13 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev)
return 0; return 0;
} }
static int __devexit __unregister_subdev(struct device *dev, void *d) static int __unregister_subdev(struct device *dev, void *d)
{ {
platform_device_unregister(to_platform_device(dev)); platform_device_unregister(to_platform_device(dev));
return 0; return 0;
} }
static int __devexit fsl_usb2_mph_dr_of_remove(struct platform_device *ofdev) static int fsl_usb2_mph_dr_of_remove(struct platform_device *ofdev)
{ {
device_for_each_child(&ofdev->dev, NULL, __unregister_subdev); device_for_each_child(&ofdev->dev, NULL, __unregister_subdev);
return 0; return 0;
......
...@@ -2645,7 +2645,7 @@ static struct hc_driver isp1362_hc_driver = { ...@@ -2645,7 +2645,7 @@ static struct hc_driver isp1362_hc_driver = {
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int __devexit isp1362_remove(struct platform_device *pdev) static int isp1362_remove(struct platform_device *pdev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = platform_get_drvdata(pdev);
struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd); struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
......
...@@ -413,7 +413,7 @@ static int isp1760_plat_probe(struct platform_device *pdev) ...@@ -413,7 +413,7 @@ static int isp1760_plat_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit isp1760_plat_remove(struct platform_device *pdev) static int isp1760_plat_remove(struct platform_device *pdev)
{ {
struct resource *mem_res; struct resource *mem_res;
resource_size_t mem_size; resource_size_t mem_size;
......
...@@ -94,7 +94,7 @@ static void at91_stop_hc(struct platform_device *pdev) ...@@ -94,7 +94,7 @@ static void at91_stop_hc(struct platform_device *pdev)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static void __devexit usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *); static void usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *);
/* configure so an HC device and id are always provided */ /* configure so an HC device and id are always provided */
/* always called with process context; sleeping is OK */ /* always called with process context; sleeping is OK */
...@@ -203,7 +203,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, ...@@ -203,7 +203,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
* context, "rmmod" or something similar. * context, "rmmod" or something similar.
* *
*/ */
static void __devexit usb_hcd_at91_remove(struct usb_hcd *hcd, static void usb_hcd_at91_remove(struct usb_hcd *hcd,
struct platform_device *pdev) struct platform_device *pdev)
{ {
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
...@@ -641,7 +641,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) ...@@ -641,7 +641,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
return usb_hcd_at91_probe(&ohci_at91_hc_driver, pdev); return usb_hcd_at91_probe(&ohci_at91_hc_driver, pdev);
} }
static int __devexit ohci_hcd_at91_drv_remove(struct platform_device *pdev) static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
{ {
struct at91_usbh_data *pdata = pdev->dev.platform_data; struct at91_usbh_data *pdata = pdev->dev.platform_data;
int i; int i;
......
...@@ -175,7 +175,7 @@ static int exynos_ohci_probe(struct platform_device *pdev) ...@@ -175,7 +175,7 @@ static int exynos_ohci_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit exynos_ohci_remove(struct platform_device *pdev) static int exynos_ohci_remove(struct platform_device *pdev)
{ {
struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data; struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
struct exynos_ohci_hcd *exynos_ohci = platform_get_drvdata(pdev); struct exynos_ohci_hcd *exynos_ohci = platform_get_drvdata(pdev);
......
...@@ -239,7 +239,7 @@ static int jz4740_ohci_probe(struct platform_device *pdev) ...@@ -239,7 +239,7 @@ static int jz4740_ohci_probe(struct platform_device *pdev)
return ret; return ret;
} }
static __devexit int jz4740_ohci_remove(struct platform_device *pdev) static int jz4740_ohci_remove(struct platform_device *pdev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = platform_get_drvdata(pdev);
struct jz4740_ohci_hcd *jz4740_ohci = hcd_to_jz4740_hcd(hcd); struct jz4740_ohci_hcd *jz4740_ohci = hcd_to_jz4740_hcd(hcd);
......
...@@ -209,7 +209,7 @@ static int ohci_hcd_omap3_probe(struct platform_device *pdev) ...@@ -209,7 +209,7 @@ static int ohci_hcd_omap3_probe(struct platform_device *pdev)
* the HCD's stop() method. It is always called from a thread * the HCD's stop() method. It is always called from a thread
* context, normally "rmmod", "apmd", or something similar. * context, normally "rmmod", "apmd", or something similar.
*/ */
static int __devexit ohci_hcd_omap3_remove(struct platform_device *pdev) static int ohci_hcd_omap3_remove(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct usb_hcd *hcd = dev_get_drvdata(dev); struct usb_hcd *hcd = dev_get_drvdata(dev);
......
...@@ -149,7 +149,7 @@ static int ohci_platform_probe(struct platform_device *dev) ...@@ -149,7 +149,7 @@ static int ohci_platform_probe(struct platform_device *dev)
return err; return err;
} }
static int __devexit ohci_platform_remove(struct platform_device *dev) static int ohci_platform_remove(struct platform_device *dev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_hcd *hcd = platform_get_drvdata(dev);
struct usb_ohci_pdata *pdata = dev->dev.platform_data; struct usb_ohci_pdata *pdata = dev->dev.platform_data;
......
...@@ -463,7 +463,7 @@ static int ohci_hcd_s3c2410_drv_probe(struct platform_device *pdev) ...@@ -463,7 +463,7 @@ static int ohci_hcd_s3c2410_drv_probe(struct platform_device *pdev)
return usb_hcd_s3c2410_probe(&ohci_s3c2410_hc_driver, pdev); return usb_hcd_s3c2410_probe(&ohci_s3c2410_hc_driver, pdev);
} }
static int __devexit ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev) static int ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = platform_get_drvdata(pdev);
......
...@@ -271,7 +271,7 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev) ...@@ -271,7 +271,7 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev)
return ret; return ret;
} }
static int __devexit ohci_hcd_tmio_drv_remove(struct platform_device *dev) static int ohci_hcd_tmio_drv_remove(struct platform_device *dev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_hcd *hcd = platform_get_drvdata(dev);
struct tmio_hcd *tmio = hcd_to_tmio(hcd); struct tmio_hcd *tmio = hcd_to_tmio(hcd);
......
...@@ -2391,7 +2391,7 @@ static const struct dev_pm_ops r8a66597_dev_pm_ops = { ...@@ -2391,7 +2391,7 @@ static const struct dev_pm_ops r8a66597_dev_pm_ops = {
#define R8A66597_DEV_PM_OPS NULL #define R8A66597_DEV_PM_OPS NULL
#endif #endif
static int __devexit r8a66597_remove(struct platform_device *pdev) static int r8a66597_remove(struct platform_device *pdev)
{ {
struct r8a66597 *r8a66597 = dev_get_drvdata(&pdev->dev); struct r8a66597 *r8a66597 = dev_get_drvdata(&pdev->dev);
struct usb_hcd *hcd = r8a66597_to_hcd(r8a66597); struct usb_hcd *hcd = r8a66597_to_hcd(r8a66597);
......
...@@ -1595,7 +1595,7 @@ static struct hc_driver sl811h_hc_driver = { ...@@ -1595,7 +1595,7 @@ static struct hc_driver sl811h_hc_driver = {
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int __devexit static int
sl811h_remove(struct platform_device *dev) sl811h_remove(struct platform_device *dev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_hcd *hcd = platform_get_drvdata(dev);
......
...@@ -206,7 +206,7 @@ static int ssb_hcd_probe(struct ssb_device *dev, ...@@ -206,7 +206,7 @@ static int ssb_hcd_probe(struct ssb_device *dev,
return err; return err;
} }
static void __devexit ssb_hcd_remove(struct ssb_device *dev) static void ssb_hcd_remove(struct ssb_device *dev)
{ {
struct ssb_hcd_device *usb_dev = ssb_get_drvdata(dev); struct ssb_hcd_device *usb_dev = ssb_get_drvdata(dev);
struct platform_device *ohci_dev = usb_dev->ohci_dev; struct platform_device *ohci_dev = usb_dev->ohci_dev;
...@@ -220,7 +220,7 @@ static void __devexit ssb_hcd_remove(struct ssb_device *dev) ...@@ -220,7 +220,7 @@ static void __devexit ssb_hcd_remove(struct ssb_device *dev)
ssb_device_disable(dev, 0); ssb_device_disable(dev, 0);
} }
static void __devexit ssb_hcd_shutdown(struct ssb_device *dev) static void ssb_hcd_shutdown(struct ssb_device *dev)
{ {
ssb_device_disable(dev, 0); ssb_device_disable(dev, 0);
} }
......
...@@ -2990,7 +2990,7 @@ static struct hc_driver u132_hc_driver = { ...@@ -2990,7 +2990,7 @@ static struct hc_driver u132_hc_driver = {
* synchronously - but instead should immediately stop activity to the * synchronously - but instead should immediately stop activity to the
* device and asynchronously call usb_remove_hcd() * device and asynchronously call usb_remove_hcd()
*/ */
static int __devexit u132_remove(struct platform_device *pdev) static int u132_remove(struct platform_device *pdev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = platform_get_drvdata(pdev);
if (hcd) { if (hcd) {
......
...@@ -560,7 +560,7 @@ static int am35x_probe(struct platform_device *pdev) ...@@ -560,7 +560,7 @@ static int am35x_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit am35x_remove(struct platform_device *pdev) static int am35x_remove(struct platform_device *pdev)
{ {
struct am35x_glue *glue = platform_get_drvdata(pdev); struct am35x_glue *glue = platform_get_drvdata(pdev);
......
...@@ -510,7 +510,7 @@ static int bfin_probe(struct platform_device *pdev) ...@@ -510,7 +510,7 @@ static int bfin_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit bfin_remove(struct platform_device *pdev) static int bfin_remove(struct platform_device *pdev)
{ {
struct bfin_glue *glue = platform_get_drvdata(pdev); struct bfin_glue *glue = platform_get_drvdata(pdev);
......
...@@ -555,7 +555,7 @@ static int da8xx_probe(struct platform_device *pdev) ...@@ -555,7 +555,7 @@ static int da8xx_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit da8xx_remove(struct platform_device *pdev) static int da8xx_remove(struct platform_device *pdev)
{ {
struct da8xx_glue *glue = platform_get_drvdata(pdev); struct da8xx_glue *glue = platform_get_drvdata(pdev);
......
...@@ -587,7 +587,7 @@ static int davinci_probe(struct platform_device *pdev) ...@@ -587,7 +587,7 @@ static int davinci_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit davinci_remove(struct platform_device *pdev) static int davinci_remove(struct platform_device *pdev)
{ {
struct davinci_glue *glue = platform_get_drvdata(pdev); struct davinci_glue *glue = platform_get_drvdata(pdev);
......
...@@ -2034,7 +2034,7 @@ static int musb_probe(struct platform_device *pdev) ...@@ -2034,7 +2034,7 @@ static int musb_probe(struct platform_device *pdev)
return status; return status;
} }
static int __devexit musb_remove(struct platform_device *pdev) static int musb_remove(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct musb *musb = dev_to_musb(dev); struct musb *musb = dev_to_musb(dev);
......
...@@ -668,7 +668,7 @@ static int dsps_probe(struct platform_device *pdev) ...@@ -668,7 +668,7 @@ static int dsps_probe(struct platform_device *pdev)
err0: err0:
return ret; return ret;
} }
static int __devexit dsps_remove(struct platform_device *pdev) static int dsps_remove(struct platform_device *pdev)
{ {
struct dsps_glue *glue = platform_get_drvdata(pdev); struct dsps_glue *glue = platform_get_drvdata(pdev);
const struct dsps_musb_wrapper *wrp = glue->wrp; const struct dsps_musb_wrapper *wrp = glue->wrp;
......
...@@ -605,7 +605,7 @@ static int omap2430_probe(struct platform_device *pdev) ...@@ -605,7 +605,7 @@ static int omap2430_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit omap2430_remove(struct platform_device *pdev) static int omap2430_remove(struct platform_device *pdev)
{ {
struct omap2430_glue *glue = platform_get_drvdata(pdev); struct omap2430_glue *glue = platform_get_drvdata(pdev);
......
...@@ -1215,7 +1215,7 @@ static int tusb_probe(struct platform_device *pdev) ...@@ -1215,7 +1215,7 @@ static int tusb_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit tusb_remove(struct platform_device *pdev) static int tusb_remove(struct platform_device *pdev)
{ {
struct tusb6010_glue *glue = platform_get_drvdata(pdev); struct tusb6010_glue *glue = platform_get_drvdata(pdev);
......
...@@ -163,7 +163,7 @@ static int ux500_probe(struct platform_device *pdev) ...@@ -163,7 +163,7 @@ static int ux500_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit ux500_remove(struct platform_device *pdev) static int ux500_remove(struct platform_device *pdev)
{ {
struct ux500_glue *glue = platform_get_drvdata(pdev); struct ux500_glue *glue = platform_get_drvdata(pdev);
......
...@@ -546,7 +546,7 @@ static int ab8500_usb_probe(struct platform_device *pdev) ...@@ -546,7 +546,7 @@ static int ab8500_usb_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit ab8500_usb_remove(struct platform_device *pdev) static int ab8500_usb_remove(struct platform_device *pdev)
{ {
struct ab8500_usb *ab = platform_get_drvdata(pdev); struct ab8500_usb *ab = platform_get_drvdata(pdev);
......
...@@ -1144,7 +1144,7 @@ static int fsl_otg_probe(struct platform_device *pdev) ...@@ -1144,7 +1144,7 @@ static int fsl_otg_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit fsl_otg_remove(struct platform_device *pdev) static int fsl_otg_remove(struct platform_device *pdev)
{ {
struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data; struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
......
...@@ -1606,7 +1606,7 @@ static int __init msm_otg_probe(struct platform_device *pdev) ...@@ -1606,7 +1606,7 @@ static int __init msm_otg_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit msm_otg_remove(struct platform_device *pdev) static int msm_otg_remove(struct platform_device *pdev)
{ {
struct msm_otg *motg = platform_get_drvdata(pdev); struct msm_otg *motg = platform_get_drvdata(pdev);
struct usb_phy *phy = &motg->phy; struct usb_phy *phy = &motg->phy;
......
...@@ -149,7 +149,7 @@ static int mxs_phy_probe(struct platform_device *pdev) ...@@ -149,7 +149,7 @@ static int mxs_phy_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit mxs_phy_remove(struct platform_device *pdev) static int mxs_phy_remove(struct platform_device *pdev)
{ {
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
......
...@@ -141,7 +141,7 @@ static int nop_usb_xceiv_probe(struct platform_device *pdev) ...@@ -141,7 +141,7 @@ static int nop_usb_xceiv_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit nop_usb_xceiv_remove(struct platform_device *pdev) static int nop_usb_xceiv_remove(struct platform_device *pdev)
{ {
struct nop_usb_xceiv *nop = platform_get_drvdata(pdev); struct nop_usb_xceiv *nop = platform_get_drvdata(pdev);
......
...@@ -199,7 +199,7 @@ static int omap_usb2_probe(struct platform_device *pdev) ...@@ -199,7 +199,7 @@ static int omap_usb2_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit omap_usb2_remove(struct platform_device *pdev) static int omap_usb2_remove(struct platform_device *pdev)
{ {
struct omap_usb *phy = platform_get_drvdata(pdev); struct omap_usb *phy = platform_get_drvdata(pdev);
......
...@@ -196,7 +196,7 @@ static int rcar_usb_phy_probe(struct platform_device *pdev) ...@@ -196,7 +196,7 @@ static int rcar_usb_phy_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit rcar_usb_phy_remove(struct platform_device *pdev) static int rcar_usb_phy_remove(struct platform_device *pdev)
{ {
struct rcar_usb_phy_priv *priv = platform_get_drvdata(pdev); struct rcar_usb_phy_priv *priv = platform_get_drvdata(pdev);
......
...@@ -556,7 +556,7 @@ static int usbhs_probe(struct platform_device *pdev) ...@@ -556,7 +556,7 @@ static int usbhs_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit usbhs_remove(struct platform_device *pdev) static int usbhs_remove(struct platform_device *pdev)
{ {
struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
struct renesas_usbhs_platform_info *info = pdev->dev.platform_data; struct renesas_usbhs_platform_info *info = pdev->dev.platform_data;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册