Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 338685
b: refs/heads/master
c: fb4e98a
h: refs/heads/master
i:
  338683: 2ed1b98
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent f37bbf5 commit 802d24a
Show file tree
Hide file tree
Showing 59 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2f82686e8c261d96d07bb1594d987cd6d5c64af6
refs/heads/master: fb4e98ab63433c4d3a1588ea91c73f1cd7ebaa00
2 changes: 1 addition & 1 deletion trunk/drivers/usb/c67x00/c67x00-drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static int c67x00_drv_probe(struct platform_device *pdev)
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 resource *res;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/chipidea/ci13xxx_imx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/chipidea/ci13xxx_msm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ static int ci13xxx_msm_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/chipidea/ci13xxx_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static int ci13xxx_pci_probe(struct pci_dev *pdev,
* first invoking the udc_remove() and then releases
* 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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/chipidea/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/chipidea/usbmisc_imx6q.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static int usbmisc_imx6q_probe(struct platform_device *pdev)
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);
clk_disable_unprepare(usbmisc->clk);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/dwc3/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ static int dwc3_probe(struct platform_device *pdev)
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 resource *res;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/dwc3/debugfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ int dwc3_debugfs_init(struct dwc3 *dwc)
return ret;
}

void __devexit dwc3_debugfs_exit(struct dwc3 *dwc)
void dwc3_debugfs_exit(struct dwc3 *dwc)
{
debugfs_remove_recursive(dwc->root);
dwc->root = NULL;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/dwc3/dwc3-exynos.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/dwc3/dwc3-omap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ static int dwc3_omap_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/dwc3/dwc3-pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ static int dwc3_pci_probe(struct pci_dev *pci,
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/bcm63xx_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2433,7 +2433,7 @@ static int bcm63xx_udc_probe(struct platform_device *pdev)
* bcm63xx_udc_remove - Remove the device from the system.
* @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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/fsl_qe_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2651,7 +2651,7 @@ static int qe_udc_resume(struct platform_device *dev)
}
#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_ep *ep;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/hid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ static int __init hidg_plat_driver_probe(struct platform_device *pdev)
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;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/lpc32xx_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3352,7 +3352,7 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/mv_u3d_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1763,7 +1763,7 @@ static void mv_u3d_gadget_release(struct device *dev)
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/mv_udc_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2128,7 +2128,7 @@ static void gadget_release(struct device *_dev)
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;
int clk_i;
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/usb/gadget/net2272.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2193,7 +2193,7 @@ net2272_gadget_release(struct device *_dev)

/*---------------------------------------------------------------------------*/

static void __devexit
static void
net2272_remove(struct net2272 *dev)
{
usb_del_gadget_udc(&dev->gadget);
Expand Down Expand Up @@ -2488,7 +2488,7 @@ net2272_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return ret;
}

static void __devexit
static void
net2272_rdk1_remove(struct pci_dev *pdev, struct net2272 *dev)
{
int i;
Expand All @@ -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)
{
int i;
Expand All @@ -2529,7 +2529,7 @@ net2272_rdk2_remove(struct pci_dev *pdev, struct net2272 *dev)
pci_resource_len(pdev, i));
}

static void __devexit
static void
net2272_pci_remove(struct pci_dev *pdev)
{
struct net2272 *dev = pci_get_drvdata(pdev);
Expand Down Expand Up @@ -2660,7 +2660,7 @@ net2272_plat_probe(struct platform_device *pdev)
return ret;
}

static int __devexit
static int
net2272_plat_remove(struct platform_device *pdev)
{
struct net2272 *dev = platform_get_drvdata(pdev);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/omap_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2974,7 +2974,7 @@ static int omap_udc_probe(struct platform_device *pdev)
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);

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/gadget/s3c-hsotg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3460,7 +3460,7 @@ static void s3c_hsotg_create_debug(struct s3c_hsotg *hsotg)
*
* 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;

Expand Down Expand Up @@ -3675,7 +3675,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
* s3c_hsotg_remove - remove function for hsotg 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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/bcma-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ static int bcma_hcd_probe(struct bcma_device *dev)
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 platform_device *ohci_dev = usb_dev->ohci_dev;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ehci-atmel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ehci-msm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static int ehci_msm_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ehci-platform.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ static int ehci_platform_probe(struct platform_device *dev)
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_ehci_pdata *pdata = dev->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ehci-s5p.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
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_hcd *s5p_ehci = platform_get_drvdata(pdev);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ehci-w90x900.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ static int ehci_w90x900_probe(struct platform_device *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);

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/host/fhci-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ static int of_fhci_probe(struct platform_device *ofdev)
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 fhci_hcd *fhci = hcd_to_fhci(hcd);
Expand All @@ -803,7 +803,7 @@ static int __devexit fhci_remove(struct device *dev)
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);
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/host/fsl-mph-dr-of.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,13 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev)
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));
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);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/isp1362-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/isp1760-if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ static int isp1760_plat_probe(struct platform_device *pdev)
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;
resource_size_t mem_size;
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/usb/host/ohci-at91.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
/* always called with process context; sleeping is OK */
Expand Down Expand Up @@ -203,7 +203,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
* 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)
{
usb_remove_hcd(hcd);
Expand Down Expand Up @@ -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);
}

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;
int i;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ohci-exynos.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ static int exynos_ohci_probe(struct platform_device *pdev)
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 exynos_ohci_hcd *exynos_ohci = platform_get_drvdata(pdev);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ohci-jz4740.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static int jz4740_ohci_probe(struct platform_device *pdev)
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 jz4740_ohci_hcd *jz4740_ohci = hcd_to_jz4740_hcd(hcd);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ohci-omap3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
* 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 usb_hcd *hcd = dev_get_drvdata(dev);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ohci-platform.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ static int ohci_platform_probe(struct platform_device *dev)
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_ohci_pdata *pdata = dev->dev.platform_data;
Expand Down
Loading

0 comments on commit 802d24a

Please sign in to comment.