summaryrefslogtreecommitdiff
path: root/drivers/staging/greybus/arche-apb-ctrl.c
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2016-01-11 11:29:11 +0530
committerGreg Kroah-Hartman <gregkh@google.com>2016-01-11 15:58:01 -0800
commitbd62fa5e1067bd5a3c8421ae3de0021a67223e22 (patch)
treee4b4727878f1f098af6e1592b3caee336fe25dc6 /drivers/staging/greybus/arche-apb-ctrl.c
parent7541c1a1c6b0e5531545c400e27b8aee2ba71610 (diff)
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 <viresh.kumar@linaro.org> Reviewed-by: Alex Elder <elder@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/arche-apb-ctrl.c')
-rw-r--r--drivers/staging/greybus/arche-apb-ctrl.c4
1 files 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;
}