diff options
| author | Viresh Kumar | 2016-01-11 06:59:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-01-12 00:58:01 +0100 |
| commit | bd62fa5e1067bd5a3c8421ae3de0021a67223e22 (patch) | |
| tree | e4b4727878f1f098af6e1592b3caee336fe25dc6 /drivers/staging/greybus/arche-apb-ctrl.c | |
| parent | greybus: arche-apb: Replace gpio_is_valid() with gpio < 0 checks (diff) | |
| download | kernel-qcow2-linux-bd62fa5e1067bd5a3c8421ae3de0021a67223e22.tar.gz kernel-qcow2-linux-bd62fa5e1067bd5a3c8421ae3de0021a67223e22.tar.xz kernel-qcow2-linux-bd62fa5e1067bd5a3c8421ae3de0021a67223e22.zip | |
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.c | 4 |
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; } |