This patch changes the driver to avoid the usage of IS_ERR_OR_NULL()
macro.
The case present in this patch simply translates to normal check for pointer,
wheather it is NULL or has an error code.
Signed-off-by: Manish Badarkhe <badarkhe.man...@gmail.com>
---
:100644 100644 bd611cdf.. ad3d4d4... M drivers/regulator/tps65090-regulator.c
drivers/regulator/tps65090-regulator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/regulator/tps65090-regulator.c
b/drivers/regulator/tps65090-regulator.c
index bd611cdf..ad3d4d4 100644
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -245,7 +245,7 @@ static int tps65090_regulator_probe(struct platform_device
*pdev)
if (!tps65090_pdata && tps65090_mfd->dev->of_node)
tps65090_pdata = tps65090_parse_dt_reg_data(pdev,
&tps65090_reg_matches);
- if (IS_ERR_OR_NULL(tps65090_pdata)) {
+ if (!tps65090_pdata || IS_ERR(tps65090_pdata)) {
dev_err(&pdev->dev, "Platform data missing\n");
return tps65090_pdata ? PTR_ERR(tps65090_pdata) : -EINVAL;
}
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
