Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / wm831x-ldo.c

diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 46d6700467b57007fbb277283207cfbbc4456fc0..eca0eeb78acd66209dcb39ca94ac5aeb3937f3bf 100644 (file)
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -235,10 +235,8 @@ static int wm831x_gp_ldo_probe(struct platform_device *pdev)
        dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
        ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
-       if (ldo == NULL) {
-               dev_err(&pdev->dev, "Unable to allocate private data\n");
+       if (!ldo)
                return -ENOMEM;
-       }
 
        ldo->wm831x = wm831x;
 
@@ -447,10 +445,8 @@ static int wm831x_aldo_probe(struct platform_device *pdev)
        dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
        ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
-       if (ldo == NULL) {
-               dev_err(&pdev->dev, "Unable to allocate private data\n");
+       if (!ldo)
                return -ENOMEM;
-       }
 
        ldo->wm831x = wm831x;
 
@@ -594,10 +590,8 @@ static int wm831x_alive_ldo_probe(struct platform_device *pdev)
        dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
        ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
-       if (ldo == NULL) {
-               dev_err(&pdev->dev, "Unable to allocate private data\n");
+       if (!ldo)
                return -ENOMEM;
-       }
 
        ldo->wm831x = wm831x;