Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

[firefly-linux-kernel-4.4.55.git] / drivers / usb / phy / rcar-phy.c

diff --git a/drivers/usb/phy/rcar-phy.c b/drivers/usb/phy/rcar-phy.c
index 703a29586a7ad100be40309c655aa2f474396b83..a35681b0c5014fdbaa44cbbf97facb2f2ec74117 100644 (file)
--- a/drivers/usb/phy/rcar-phy.c
+++ b/drivers/usb/phy/rcar-phy.c
@@ -142,7 +142,7 @@ static void rcar_usb_phy_shutdown(struct usb_phy *phy)
        spin_unlock_irqrestore(&priv->lock, flags);
 }
 
-static int __devinit rcar_usb_phy_probe(struct platform_device *pdev)
+static int rcar_usb_phy_probe(struct platform_device *pdev)
 {
        struct rcar_usb_phy_priv *priv;
        struct resource *res0, *res1;
@@ -196,7 +196,7 @@ static int __devinit rcar_usb_phy_probe(struct platform_device *pdev)
        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);