From bd62fa5e1067bd5a3c8421ae3de0021a67223e22 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Mon, 11 Jan 2016 11:29:11 +0530 Subject: [PATCH] greybus: arche-apb: devm_regulator_get() doesn't return NULL And so we don't need to check for it. Signed-off-by: Viresh Kumar Reviewed-by: Alex Elder Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/arche-apb-ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/greybus/arche-apb-ctrl.c b/drivers/staging/greybus/arche-apb-ctrl.c index b06bb3453ca4..1ae2c06c8e33 100644 --- a/drivers/staging/greybus/arche-apb-ctrl.c +++ b/drivers/staging/greybus/arche-apb-ctrl.c @@ -246,13 +246,13 @@ static int apb_ctrl_get_devtree_data(struct platform_device *pdev, /* Regulators are optional, as we may have fixed supply coming in */ apb->vcore = devm_regulator_get(dev, "vcore"); - if (IS_ERR_OR_NULL(apb->vcore)) { + if (IS_ERR(apb->vcore)) { dev_info(dev, "no core regulator found\n"); apb->vcore = NULL; } apb->vio = devm_regulator_get(dev, "vio"); - if (IS_ERR_OR_NULL(apb->vio)) { + if (IS_ERR(apb->vio)) { dev_info(dev, "no IO regulator found\n"); apb->vio = NULL; } -- 2.20.1