Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Guo Zhengkui <guozhengkui@vivo.com>
To:     Mauro Carvalho Chehab <mchehab@kernel.org>,
        Sakari Ailus <sakari.ailus@linux.intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Guo Zhengkui <guozhengkui@vivo.com>,
        linux-media@vger.kernel.org (open list:STAGING - ATOMISP DRIVER),
        linux-staging@lists.linux.dev (open list:STAGING SUBSYSTEM),
        linux-kernel@vger.kernel.org (open list)
Cc:     zhengkui_guo@outlook.com
Subject: [PATCH] media: atomisp: simplify if-if to if-else
Date:   Fri,  1 Apr 2022 11:33:23 +0800
Message-Id: <20220401033335.16881-1-guozhengkui@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gO72/fuh3VeM2EYPcmoBdhVrJ3wYarE7wz3L0p3jxSgStL0+QySZJuUePPQA?=
 =?us-ascii?Q?+lSpJch0+BV2Xbk3hD0ZDAfR3ps9IZ8XgN56oqnbJEcFThFhiFZd6eZQtlhJ?=
 =?us-ascii?Q?GoAQS2o964ARCqgVfum2E1g11STACWT3R5LlukZ4XDDFqtgteUOTmpAgmLlU?=
 =?us-ascii?Q?w1LsjCxJxVi5u5ihj559stBGJEL5DvEsOjl3jl9B+t2D1ND3UvTrYs96l/Nm?=
 =?us-ascii?Q?YnVUjGa6XqlSS8Ll4Uzx70j1v2raB+sGNC7oUdLOsuxRFX9ndF4ZdOQ7caZz?=
 =?us-ascii?Q?ur73jEe2vTqZPYrHe2Eub8DtqYsQ+r2TWlnqflIfrQk4nchqTzSvyTtFS/8K?=
 =?us-ascii?Q?Pw1FAMupK0Uaw1bBfSKN3uawBsMKNBkv+uCNPXpsm5Qddqozh1GqQmGfr7lW?=
 =?us-ascii?Q?mA8eBHmNqCXld1siBNAMRxeyQoZjJSfGFAJ1Jwhxx60wDPHWK46lmM+XA3UH?=
 =?us-ascii?Q?aXXt21wuzMcWv0dAtN9wVOvOrgVM/mbniYWRLMNkV1UKrAfoV8j2T1myGvLi?=
 =?us-ascii?Q?HsWetE4pmSJXG0GFekP5VagFHTDy2VhRDLJqjFTHEDbw3Kk87lVzjPoRvtac?=
 =?us-ascii?Q?KV4tieOfPntgAFpELNLC/3oGsSr70VtOEkofxuBC8aFPJBKMiaRxK23Uuk7H?=
 =?us-ascii?Q?oHOjV95EsoHtbnE28C8Vy/EQZ5ltA74vxsc0Rzty+zrC9Q5n8KRfrqpoV75c?=
 =?us-ascii?Q?lyyDfW6tFkValxEFriSzigKwOruKqtff8mHspPEQvO/qefrCNyEmvjWcNHLA?=
 =?us-ascii?Q?7iDUZ7E/uIG+DLw99um84Y+SvXVyjUjPad46KXykc8ucNYkepoNAwMZoYq7j?=
 =?us-ascii?Q?gTtg1SqsuWIfCosDAh9Hcoww+k7eAWBnsAwo/C3N+d9yvNrRhUN2Zrqjq7KJ?=
 =?us-ascii?Q?dTkGBBSRHkI/EG2r8FrdOs/6ivg2xsOeqQ/+qkZT5V17ZxWcL/t+/CfqmSG3?=
 =?us-ascii?Q?EOz3qttBKz6RZ7VGXckQ/lwKpEPkvNagYZd4WXynhpJTFMaI6dLaoU/P6YQx?=
 =?us-ascii?Q?3YYEwHVqjM25/JcCwJu/xyVi9b4VyN8ZU7O5TagvXdbGgk7mKCTbxPyS91XX?=
 =?us-ascii?Q?xFrWySBIzygVldpZsrftm2FYKkcJC477Y8qq2zS6tTRdAfYKdmZSXjJ9QzNs?=
 =?us-ascii?Q?g17RYiiI1vu9floDSrIZhLq58UK1X0EAphc0orUW3XEdPssbP3Svspzxr/+i?=
 =?us-ascii?Q?l6TdKbMBTOvYwDHz2a4Z4ueZH5/KskJjZ3vbaatDa9hp/LGv+BHtUXY5mqE+?=
 =?us-ascii?Q?Qa/1FMIm5SdaY1RKdmMwGUhDvm+hhMvauaRVAcMh4lThp62NzqWMMKHl1mav?=
 =?us-ascii?Q?qK9zR7qZDtW/C6/FZzWK5ouuUibxAoUm0WNHvFhmjkhu0G5zXcBKuBx4slvo?=
 =?us-ascii?Q?HaO8tlxbQkv3pXjVHtaejipScIVINkjDN/MsSCbCKSE0S5lqSvw4ex7Ducu7?=
 =?us-ascii?Q?g1Ci2T8uapCYijGhEId2R/5XNPqGBFEKcvW96EDbIJPnp3QUp8OJgiLOS30O?=
 =?us-ascii?Q?vEp41LAiSQwuw1RSMwwKQACQJnvv/24D/FvnO8G72KkYvSSl/zREHQaNByZX?=
 =?us-ascii?Q?RgjbMYP3RQpeNx3NhBH8kDaXrxedsQOcljHwrGwq+0bYqHMnklUBlNgB0OV7?=
 =?us-ascii?Q?nT4sntNHvddx9RaJEBf4FcHNw6yMeOFPPHV67Uh5bEErafH5oElIaW3db2qG?=
 =?us-ascii?Q?4V+6ncA8h9zudTjmA03iz9jiPYAW0mhBL3p/fh908a1YNxu0zwt9skk+kjGY?=
 =?us-ascii?Q?VPcAgVrwRw=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cf883ccd-e69e-4708-de1f-08da13907726
X-MS-Exchange-CrossTenant-AuthSource: HK2PR06MB3492.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2022 03:34:02.3631
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: R3aXPZnPwZPsdsSMSfHrlWfoqWZYE7fGIhkvDNZB2Jf6qndNkDOqLKrceInXuds/5z5Rwb+sKLsciwzi92Odlg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS2PR06MB3575
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Replace `if (!ret)` with `else` for simplification and add curly
brackets according to the kernel coding style:

"Do not unnecessarily use braces where a single statement will do."

...

"This does not apply if only one branch of a conditional statement is
a single statement; in the latter case use braces in both branches"

Please refer to:
https://www.kernel.org/doc/html/v5.17-rc8/process/coding-style.html

Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
---
 drivers/staging/media/atomisp/pci/hmm/hmm_bo.c       |  4 ++--
 .../staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c | 12 ++++++------
 .../media/atomisp/pci/hmm/hmm_reserved_pool.c        |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
index 0168f9839c90..ee7805c9d4e5 100644
--- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
@@ -668,7 +668,7 @@ static void free_private_bo_pages(struct hmm_buffer_object *bo,
 		 */
 		default:
 			ret = set_pages_wb(bo->page_obj[i].page, 1);
-			if (ret)
+			if (ret) {
 				dev_err(atomisp_dev,
 					"set page to WB err ...ret = %d\n",
 					ret);
@@ -679,7 +679,7 @@ static void free_private_bo_pages(struct hmm_buffer_object *bo,
 			then, _free_pages would panic; Do not know why page
 			address be valid,it maybe memory corruption by lowmemory
 			*/
-			if (!ret) {
+			} else {
 				__free_pages(bo->page_obj[i].page, 0);
 				hmm_mem_stat.sys_size--;
 			}
diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c b/drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c
index eaf97e5f3b68..44b05b87f3ea 100644
--- a/drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c
@@ -94,7 +94,7 @@ static void free_pages_to_dynamic_pool(void *pool,
 	if (dypool_info->pgnr >= dypool_info->pool_size) {
 		/* free page directly back to system */
 		ret = set_pages_wb(page_obj->page, 1);
-		if (ret)
+		if (ret) {
 			dev_err(atomisp_dev,
 				"set page to WB err ...ret=%d\n", ret);
 		/*
@@ -104,7 +104,7 @@ static void free_pages_to_dynamic_pool(void *pool,
 		then, _free_pages would panic; Do not know why page
 		address be valid, it maybe memory corruption by lowmemory
 		*/
-		if (!ret) {
+		} else {
 			__free_pages(page_obj->page, 0);
 			hmm_mem_stat.sys_size--;
 		}
@@ -115,10 +115,10 @@ static void free_pages_to_dynamic_pool(void *pool,
 	if (!hmm_page) {
 		/* free page directly */
 		ret = set_pages_wb(page_obj->page, 1);
-		if (ret)
+		if (ret) {
 			dev_err(atomisp_dev,
 				"set page to WB err ...ret=%d\n", ret);
-		if (!ret) {
+		} else {
 			__free_pages(page_obj->page, 0);
 			hmm_mem_stat.sys_size--;
 		}
@@ -194,10 +194,10 @@ static void hmm_dynamic_pool_exit(void **pool)
 
 		/* can cause thread sleep, so cannot be put into spin_lock */
 		ret = set_pages_wb(hmm_page->page, 1);
-		if (ret)
+		if (ret) {
 			dev_err(atomisp_dev,
 				"set page to WB err...ret=%d\n", ret);
-		if (!ret) {
+		} else {
 			__free_pages(hmm_page->page, 0);
 			hmm_mem_stat.dyc_size--;
 			hmm_mem_stat.sys_size--;
diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c b/drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c
index 57525fece921..8b424217095f 100644
--- a/drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c
@@ -224,7 +224,7 @@ static void hmm_reserved_pool_exit(void **pool)
 		then, _free_pages would panic; Do not know why
 		page address be valid, it maybe memory corruption by lowmemory
 		*/
-		if (!ret)
+		else
 			__free_pages(repool_info->pages[i], 0);
 	}
 
-- 
2.20.1