From: Punit Agrawal <punit.agrawal@arm.com>
Date: Mon, 19 Mar 2018 17:36:07 +0000 (+0000)
Subject: video: rk3288_mipi: Combine NULL check into IS_ERR_OR_NULL()
X-Git-Tag: v2018.05-rc1~5^2~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6e60779156531f24c4585992615da7a14da2a836;p=u-boot

video: rk3288_mipi: Combine NULL check into IS_ERR_OR_NULL()

Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---

diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c
index 27d125f77e..a7fa9c5110 100644
--- a/drivers/video/rockchip/rk3288_mipi.c
+++ b/drivers/video/rockchip/rk3288_mipi.c
@@ -136,7 +136,7 @@ static int rk_mipi_ofdata_to_platdata(struct udevice *dev)
 	struct rk_mipi_priv *priv = dev_get_priv(dev);
 
 	priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
-	if (!priv->grf || IS_ERR(priv->grf)) {
+	if (IS_ERR_OR_NULL(priv->grf)) {
 		debug("%s: Get syscon grf failed (ret=%p)\n",
 		      __func__, priv->grf);
 		return  -ENXIO;