Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364331
b: refs/heads/master
c: 39d3568
h: refs/heads/master
i:
  364329: 470450a
  364327: 3974885
v: v3
  • Loading branch information
Dmitry Torokhov authored and Greg Kroah-Hartman committed Mar 15, 2013
1 parent 094c4dc commit 1f6deca
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8a7298d361827a1f244415dde62b1b07688d6a3a
refs/heads/master: 39d35681d5380b403855202dcd75575a8d5b0ec1
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ehci-mxc.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
return ret;
}

static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)
static int ehci_mxc_drv_remove(struct platform_device *pdev)
{
struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
struct usb_hcd *hcd = platform_get_drvdata(pdev);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/host/ehci-orion.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
return err;
}

static int __exit ehci_orion_drv_remove(struct platform_device *pdev)
static int ehci_orion_drv_remove(struct platform_device *pdev)
{
struct usb_hcd *hcd = platform_get_drvdata(pdev);
struct clk *clk;
Expand Down Expand Up @@ -333,7 +333,7 @@ MODULE_DEVICE_TABLE(of, ehci_orion_dt_ids);

static struct platform_driver ehci_orion_driver = {
.probe = ehci_orion_drv_probe,
.remove = __exit_p(ehci_orion_drv_remove),
.remove = ehci_orion_drv_remove,
.shutdown = usb_hcd_platform_shutdown,
.driver = {
.name = "orion-ehci",
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/host/ehci-sh.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev)
return ret;
}

static int __exit ehci_hcd_sh_remove(struct platform_device *pdev)
static int ehci_hcd_sh_remove(struct platform_device *pdev)
{
struct ehci_sh_priv *priv = platform_get_drvdata(pdev);
struct usb_hcd *hcd = priv->hcd;
Expand All @@ -196,7 +196,7 @@ static void ehci_hcd_sh_shutdown(struct platform_device *pdev)

static struct platform_driver ehci_hcd_sh_driver = {
.probe = ehci_hcd_sh_probe,
.remove = __exit_p(ehci_hcd_sh_remove),
.remove = ehci_hcd_sh_remove
.shutdown = ehci_hcd_sh_shutdown,
.driver = {
.name = "sh_ehci",
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/otg/isp1301_omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@ static void isp1301_release(struct device *dev)

static struct isp1301 *the_transceiver;

static int __exit isp1301_remove(struct i2c_client *i2c)
static int isp1301_remove(struct i2c_client *i2c)
{
struct isp1301 *isp;

Expand Down Expand Up @@ -1634,7 +1634,7 @@ static struct i2c_driver isp1301_driver = {
.name = "isp1301_omap",
},
.probe = isp1301_probe,
.remove = __exit_p(isp1301_remove),
.remove = isp1301_remove,
.id_table = isp1301_id,
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/otg/twl4030-usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
return 0;
}

static int __exit twl4030_usb_remove(struct platform_device *pdev)
static int twl4030_usb_remove(struct platform_device *pdev)
{
struct twl4030_usb *twl = platform_get_drvdata(pdev);
int val;
Expand Down Expand Up @@ -702,7 +702,7 @@ MODULE_DEVICE_TABLE(of, twl4030_usb_id_table);

static struct platform_driver twl4030_usb_driver = {
.probe = twl4030_usb_probe,
.remove = __exit_p(twl4030_usb_remove),
.remove = twl4030_usb_remove,
.driver = {
.name = "twl4030_usb",
.owner = THIS_MODULE,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/otg/twl6030-usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ static int twl6030_usb_probe(struct platform_device *pdev)
return 0;
}

static int __exit twl6030_usb_remove(struct platform_device *pdev)
static int twl6030_usb_remove(struct platform_device *pdev)
{
struct twl6030_usb *twl = platform_get_drvdata(pdev);

Expand All @@ -420,7 +420,7 @@ MODULE_DEVICE_TABLE(of, twl6030_usb_id_table);

static struct platform_driver twl6030_usb_driver = {
.probe = twl6030_usb_probe,
.remove = __exit_p(twl6030_usb_remove),
.remove = twl6030_usb_remove,
.driver = {
.name = "twl6030_usb",
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/phy/mv_u3d_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ static int mv_u3d_phy_probe(struct platform_device *pdev)
return ret;
}

static int __exit mv_u3d_phy_remove(struct platform_device *pdev)
static int mv_u3d_phy_remove(struct platform_device *pdev)
{
struct mv_u3d_phy *mv_u3d_phy = platform_get_drvdata(pdev);

Expand Down

0 comments on commit 1f6deca

Please sign in to comment.