Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / phy / phy-omap-control.c

diff --git a/drivers/phy/phy-omap-control.c b/drivers/phy/phy-omap-control.c
index 9487bf1..c96e818 100644 (file)
--- a/drivers/phy/phy-omap-control.c
+++ b/drivers/phy/phy-omap-control.c
@@ -295,10 +295,8 @@ static int omap_control_phy_probe(struct platform_device *pdev)
 
        control_phy = devm_kzalloc(&pdev->dev, sizeof(*control_phy),
                GFP_KERNEL);
-       if (!control_phy) {
-               dev_err(&pdev->dev, "unable to alloc memory for control phy\n");
+       if (!control_phy)
                return -ENOMEM;
-       }
 
        control_phy->dev = &pdev->dev;
        control_phy->type = *(enum omap_control_phy_type *)of_id->data;
@@ -347,7 +345,6 @@ static struct platform_driver omap_control_phy_driver = {
        .probe          = omap_control_phy_probe,
        .driver         = {
                .name   = "omap-control-phy",
-               .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(omap_control_phy_id_table),
        },
 };