Merge remote-tracking branch 'input-current/for-linus'

[karo-tx-linux.git] / drivers / char / hw_random / mxc-rnga.c

diff --git a/drivers/char/hw_random/mxc-rnga.c b/drivers/char/hw_random/mxc-rnga.c
index 6cbb72ec60131ab248237921d733e5f659728ebc..467362262651e61f836258d9783a7672a857c8a0 100644 (file)
--- a/drivers/char/hw_random/mxc-rnga.c
+++ b/drivers/char/hw_random/mxc-rnga.c
@@ -141,12 +141,11 @@ static void mxc_rnga_cleanup(struct hwrng *rng)
 
 static int __init mxc_rnga_probe(struct platform_device *pdev)
 {
-       int err = -ENODEV;
+       int err;
        struct resource *res;
        struct mxc_rng *mxc_rng;
 
-       mxc_rng = devm_kzalloc(&pdev->dev, sizeof(struct mxc_rng),
-                                       GFP_KERNEL);
+       mxc_rng = devm_kzalloc(&pdev->dev, sizeof(*mxc_rng), GFP_KERNEL);
        if (!mxc_rng)
                return -ENOMEM;
 
@@ -160,13 +159,12 @@ static int __init mxc_rnga_probe(struct platform_device *pdev)
        mxc_rng->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(mxc_rng->clk)) {
                dev_err(&pdev->dev, "Could not get rng_clk!\n");
-               err = PTR_ERR(mxc_rng->clk);
-               goto out;
+               return PTR_ERR(mxc_rng->clk);
        }
 
        err = clk_prepare_enable(mxc_rng->clk);
        if (err)
-               goto out;
+               return err;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        mxc_rng->mem = devm_ioremap_resource(&pdev->dev, res);
@@ -181,14 +179,10 @@ static int __init mxc_rnga_probe(struct platform_device *pdev)
                goto err_ioremap;
        }
 
-       dev_info(&pdev->dev, "MXC RNGA Registered.\n");
-
        return 0;
 
 err_ioremap:
        clk_disable_unprepare(mxc_rng->clk);
-
-out:
        return err;
 }