base/platform: Simplifications for NULL platform data/resources handling

There's no need to explicitly check for data and resources being NULL,
as platform_device_add_{data,resources}() do this internally nowadays.

This makes the code more linear and less indented.

Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index c794fec1c4353b08a410fa4ca22de5541d3e3a98..3966e62ad01950921c8dd497b233642caaef4a5f 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -380,17 +380,13 @@ struct platform_device *__init_or_module platform_device_register_resndata(
 
        pdev->dev.parent = parent;
 
-       if (res) {
-               ret = platform_device_add_resources(pdev, res, num);
-               if (ret)
-                       goto err;
-       }
+       ret = platform_device_add_resources(pdev, res, num);
+       if (ret)
+               goto err;
 
-       if (data) {
-               ret = platform_device_add_data(pdev, data, size);
-               if (ret)
-                       goto err;
-       }
+       ret = platform_device_add_data(pdev, data, size);
+       if (ret)
+               goto err;
 
        ret = platform_device_add(pdev);
        if (ret) {
@@ -537,17 +533,13 @@ struct platform_device * __init_or_module platform_create_bundle(
                goto err_out;
        }
 
-       if (res) {
-               error = platform_device_add_resources(pdev, res, n_res);
-               if (error)
-                       goto err_pdev_put;
-       }
+       error = platform_device_add_resources(pdev, res, n_res);
+       if (error)
+               goto err_pdev_put;
 
-       if (data) {
-               error = platform_device_add_data(pdev, data, size);
-               if (error)
-                       goto err_pdev_put;
-       }
+       error = platform_device_add_data(pdev, data, size);
+       if (error)
+               goto err_pdev_put;
 
        error = platform_device_add(pdev);
        if (error)