From 2702aa0d1786d62c9e7d7ee1468715e3e7e60c84 Mon Sep 17 00:00:00 2001 From: Vivek Gautam Date: Mon, 21 Jan 2013 19:30:12 +0530 Subject: [PATCH] --- yaml --- r: 354687 b: refs/heads/master c: 5a1a174c2c7f51b562071e06c9b52c5fd8adf6da h: refs/heads/master i: 354685: 63611ba5477b035ba81af7001fd170044ce1f85d 354683: f244745786b600a05ad2174be8a8000a2a49582b 354679: 016fba341ef99fc09f3a7a34816af0a008212cbe 354671: 76271377aafea5bee25cdf1380680ee2036d4fa0 354655: e6cd390d342e809b66fbf9592a14319acc50a3b5 354623: ef70e29448d04a889ef8548734105e599f5a8730 354559: 9c74971874c8c6b438a25c0116caaf8fe091f2bb v: v3 --- [refs] | 2 +- trunk/drivers/usb/phy/samsung-usbphy.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a6f5f614d2db..995d20c474c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed993bf19b98fdb0d364913174b5001fc3ac199b +refs/heads/master: 5a1a174c2c7f51b562071e06c9b52c5fd8adf6da diff --git a/trunk/drivers/usb/phy/samsung-usbphy.c b/trunk/drivers/usb/phy/samsung-usbphy.c index 9e9861c673ab..6ea553733832 100644 --- a/trunk/drivers/usb/phy/samsung-usbphy.c +++ b/trunk/drivers/usb/phy/samsung-usbphy.c @@ -769,7 +769,7 @@ static inline const struct samsung_usbphy_drvdata platform_get_device_id(pdev)->driver_data; } -static int __devinit samsung_usbphy_probe(struct platform_device *pdev) +static int samsung_usbphy_probe(struct platform_device *pdev) { struct samsung_usbphy *sphy; struct usb_otg *otg; @@ -847,7 +847,7 @@ static int __devinit samsung_usbphy_probe(struct platform_device *pdev) return usb_add_phy(&sphy->phy, USB_PHY_TYPE_USB2); } -static int __exit samsung_usbphy_remove(struct platform_device *pdev) +static int samsung_usbphy_remove(struct platform_device *pdev) { struct samsung_usbphy *sphy = platform_get_drvdata(pdev); @@ -913,7 +913,7 @@ MODULE_DEVICE_TABLE(platform, samsung_usbphy_driver_ids); static struct platform_driver samsung_usbphy_driver = { .probe = samsung_usbphy_probe, - .remove = __devexit_p(samsung_usbphy_remove), + .remove = samsung_usbphy_remove, .id_table = samsung_usbphy_driver_ids, .driver = { .name = "samsung-usbphy",