Skip to contentSkip to conversation

video: rk3399_mipi: correct error checking

PATCH New Heinrich Schuchardt 3 participants 6 messages Mar 18, 2018 – Mar 19, 2018

Subsystems (2)
Framebuffer layer Arm Rockchip
lore
Share & tools
lore

Heinrich Schuchardt

author
#0 lore raw

PATCH 1/1 video: rk3399_mipi: correct error checking

Pointers are never negative. Use macro IS_ERR() for checking. cf. rk3288_mipi.c

Signed-off-by Heinrich Schuchardt <[email protected]>
---
 drivers/video/rockchip/rk3399_mipi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/rockchip/rk3399_mipi.c +1 -1
index 9ef202bf09..7560e0c07b 100644
@@ -128,7 +128,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 <= 0) {
+	if (!priv->grf || IS_ERR(priv->grf)) {
 		debug("%s: Get syscon grf failed (ret=%p)\n",
 		      __func__, priv->grf);
 		return  -ENXIO;
Signature · 1 line
2.16.2
#3 lore raw

PATCH 1/1 video: rk3399_mipi: correct error checking

In reply to Heinrich Schuchardt
Quoted 10 lines

Pointers are never negative. Use macro IS_ERR() for checking. cf. rk3288_mipi.c

Signed-off-by Heinrich Schuchardt <[email protected]>
Acked-by Philipp Tomsich <[email protected]>
Reviewed-by Philipp Tomsich <[email protected]>
---
 drivers/video/rockchip/rk3399_mipi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to u-boot-rockchip, thanks!

#4 lore raw

PATCH 1/1 video: rk3399_mipi: correct error checking

In reply to Heinrich Schuchardt
Quoted 13 lines · Heinrich Schuchardt

Pointers are never negative. Use macro IS_ERR() for checking. cf. rk3288_mipi.c

Signed-off-by Heinrich Schuchardt <[email protected]>
---
 drivers/video/rockchip/rk3399_mipi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/rockchip/rk3399_mipi.c +0 -0
index 9ef202bf09..7560e0c07b 100644

drivers/video/rockchip/rk3399_mipi.c static int rk_mipi_ofdata_to_platdata(struct udevice *dev) · line 131

Quoted 5 lines
drivers/video/rockchip/rk3399_mipi.c +1 -1
@@ -128,7 +128,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 <= 0) {
+	if (!priv->grf || IS_ERR(priv->grf)) {

The above two checks can be combined into IS_ERR_OR_NULL().

Quoted 3 lines
drivers/video/rockchip/rk3399_mipi.c +0 -0
 		debug("%s: Get syscon grf failed (ret=%p)\n",
 		      __func__, priv->grf);
 		return  -ENXIO;
#5 lore raw

PATCH 1/1 video: rk3399_mipi: correct error checking

Punit,

Quoted 19 lines · Punit Agrawal
Quoted 15 lines · Heinrich Schuchardt <xypron.glpk at gmx.de <mailto:[email protected]>> writes:

Pointers are never negative. Use macro IS_ERR() for checking. cf. rk3288_mipi.c

Signed-off-by Heinrich Schuchardt <[email protected]>

---
drivers/video/rockchip/rk3399_mipi.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/rockchip/rk3399_mipi.c +0 -0
index 9ef202bf09..7560e0c07b 100644
@@ -128,7 +128,7 @@ static int rk_mipi_ofdata_to_platdata(struct udevice *dev)
 	struct rk_mipi_priv *priv = dev_get_priv(dev);
Quoted 5 lines

drivers/video/rockchip/rk3399_mipi.c static int rk_mipi_ofdata_to_platdata(struct udevice *dev) · line 131

Quoted 3 lines
drivers/video/rockchip/rk3399_mipi.c +1 -1
 	priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
-	if (priv->grf <= 0) {
+	if (!priv->grf || IS_ERR(priv->grf)) {

The above two checks can be combined into IS_ERR_OR_NULL().

Please submit a patch and I’ll squash it onto this one.

Thanks,
Philipp.

Quoted 4 lines
Quoted 4 lines
drivers/video/rockchip/rk3399_mipi.c +0 -0
 		debug("%s: Get syscon grf failed (ret=%p)\n",
 		      __func__, priv->grf);
 		return  -ENXIO;