Merge remote-tracking branch 'pinctrl/for-next'

[deliverable/linux.git] / drivers / pinctrl / samsung / pinctrl-samsung.c

diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c
index 513fe6b23248868c2e60ed273bf9e0303cf10d82..620727fabe6437feb63f6d4b24f11949616131f4 100644 (file)
--- a/drivers/pinctrl/samsung/pinctrl-samsung.c
+++ b/drivers/pinctrl/samsung/pinctrl-samsung.c
@@ -1041,17 +1041,9 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
        struct resource *res;
        int ret;
 
-       if (!dev->of_node) {
-               dev_err(dev, "device tree node not found\n");
-               return -ENODEV;
-       }
-
        drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
-       if (!drvdata) {
-               dev_err(dev, "failed to allocate memory for driver's "
-                               "private data\n");
+       if (!drvdata)
                return -ENOMEM;
-       }
 
        ctrl = samsung_pinctrl_get_soc_data(drvdata, pdev);
        if (IS_ERR(ctrl)) {