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

[karo-tx-linux.git] / drivers / mfd / kempld-core.c

diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index 463f4eae20c1da40a2f7e215d031b91d27c30720..05b924542ee2b1118635e90348a6a8a8e8a6d603 100644 (file)
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -448,7 +448,6 @@ static int kempld_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct kempld_device_data *pld;
        struct resource *ioport;
-       int ret;
 
        pld = devm_kzalloc(dev, sizeof(*pld), GFP_KERNEL);
        if (!pld)
@@ -471,11 +470,7 @@ static int kempld_probe(struct platform_device *pdev)
        mutex_init(&pld->lock);
        platform_set_drvdata(pdev, pld);
 
-       ret = kempld_detect_device(pld);
-       if (ret)
-               return ret;
-
-       return 0;
+       return kempld_detect_device(pld);
 }
 
 static int kempld_remove(struct platform_device *pdev)
@@ -756,7 +751,6 @@ MODULE_DEVICE_TABLE(dmi, kempld_dmi_table);
 static int __init kempld_init(void)
 {
        const struct dmi_system_id *id;
-       int ret;
 
        if (force_device_id[0]) {
                for (id = kempld_dmi_table;
@@ -771,11 +765,7 @@ static int __init kempld_init(void)
                        return -ENODEV;
        }
 
-       ret = platform_driver_register(&kempld_driver);
-       if (ret)
-               return ret;
-
-       return 0;
+       return platform_driver_register(&kempld_driver);
 }
 
 static void __exit kempld_exit(void)