From: Sudeep Holla <sudeep.holla@arm.com>
Date: Wed, 9 May 2018 16:52:06 +0000 (+0100)
Subject: firmware: arm_scmi: simplify exit path by returning on error
X-Git-Tag: v4.18-rc1~49^2~6^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=632de8f542bcd44c756637da0e7d824e7129e496;p=users%2Fjedix%2Flinux-maple.git

firmware: arm_scmi: simplify exit path by returning on error

Yet another nasty indentation left out during code restructuring. It's
must simpler to return on error instead of having unnecessary indentation.

Suggested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 4087d6c50ecd..e996395af5f2 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -687,11 +687,12 @@ static int scmi_remove(struct platform_device *pdev)
 		list_del(&info->node);
 	mutex_unlock(&scmi_list_mutex);
 
-	if (!ret) {
-		/* Safe to free channels since no more users */
-		ret = idr_for_each(idr, scmi_mbox_free_channel, idr);
-		idr_destroy(&info->tx_idr);
-	}
+	if (ret)
+		return ret;
+
+	/* Safe to free channels since no more users */
+	ret = idr_for_each(idr, scmi_mbox_free_channel, idr);
+	idr_destroy(&info->tx_idr);
 
 	return ret;
 }