From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF127C433DB for ; Mon, 22 Mar 2021 11:46:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B23B961992 for ; Mon, 22 Mar 2021 11:46:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230215AbhCVLpo (ORCPT ); Mon, 22 Mar 2021 07:45:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:44094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230186AbhCVLpS (ORCPT ); Mon, 22 Mar 2021 07:45:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 945126198D; Mon, 22 Mar 2021 11:45:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616413518; bh=liwkJr++xOmGVh9TPdenTt5K01dJM4oOTKgZCRao8aE=; h=From:To:Cc:Subject:Date:From; b=kbYalYvBeuLzPrVLtbx44T1v/8Z+M7nARJqzUOvEZS21sWRUC+xT2rbuhnUHSyV/h G7NJO4+Wut5U+8JT8eTSvosRajsGXhrJ/vlWqESbNQSIn8qVFXebo9AwV3LLlaE5J6 4/ebt+CABMqJJmpigDR20TD5DnkL1Nuvg9UqlUTV9ji3n4rC5fU7IXesHPBhvK2rN9 zl2IIWE5DEV6+pwzMsrRMm1Xg1yIjiAfvlVdnuo/uTZGRDq5dUUNUiGFVxlcICymrO Pys3xfKwfKBTuyy/6Ra8mqke1DWkKRVQqP3V0Bni0wlL6sOi/0izhgbF8kjWPdFebC USNdtP74Gsd0A== From: Arnd Bergmann To: Dan Williams , Vishal Verma , Dave Jiang Cc: Arnd Bergmann , Andrew Morton , Joao Martins , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Zhen Lei , linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org Subject: [PATCH] dax: avoid -Wempty-body warnings Date: Mon, 22 Mar 2021 12:44:58 +0100 Message-Id: <20210322114514.3490752-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann gcc warns about an empty body in an else statement: drivers/dax/bus.c: In function 'do_id_store': drivers/dax/bus.c:94:48: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body] 94 | /* nothing to remove */; | ^ drivers/dax/bus.c:99:43: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body] 99 | /* dax_id already added */; | ^ In both of these cases, the 'else' exists only to have a place to add a comment, but that comment doesn't really explain that much either, so the easiest way to shut up that warning is to just remove the else. Signed-off-by: Arnd Bergmann --- drivers/dax/bus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 452e85ae87a8..5aee26e1bbd6 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -90,13 +90,11 @@ static ssize_t do_id_store(struct device_driver *drv, const char *buf, list_add(&dax_id->list, &dax_drv->ids); } else rc = -ENOMEM; - } else - /* nothing to remove */; + } } else if (action == ID_REMOVE) { list_del(&dax_id->list); kfree(dax_id); - } else - /* dax_id already added */; + } mutex_unlock(&dax_bus_lock); if (rc < 0) -- 2.29.2