Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3320356pxf; Mon, 22 Mar 2021 03:46:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzslRFFOo9/5BXQHcYdGyTKwg1RtgGooAIw3pGtR47lzUUzbSKxKPjirS909f68y9Hw/oYa X-Received: by 2002:aa7:c550:: with SMTP id s16mr24927579edr.98.1616409998682; Mon, 22 Mar 2021 03:46:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616409998; cv=none; d=google.com; s=arc-20160816; b=G2p98AUjUfuYWYe3JiMH26VhyKaV2wABjk555r3woo8zRmBtpjALZ8xI5Ae4CqXMw/ WzBQ7ETfmMJ9ycvRAQaIol8q5FwFxb6MD6LtxQopiHPYhjRi44g8fdq0KQS9g324y1gq Nc7uy7solVMTXxpPac1ZJ5T6wqvTV8OXBGSi8ogY+ETccRuLtVdW1u5GUlQPis8N00yb mj1Ml7JPP1l8PtSb2ra6WR2kCwsaz4CDILdCuQFKlnVw7Ci5AvL9aEF3kiRg8wGyf3hx xeissWJSFBJovG8+Q04d/du0+DFRxkU5hjE0BFMokXYD2xrv2eeenBifIollRnc0DH+6 Q+1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TAtsvAxz+4hVJTw3guwVRJOrTxK6TiQf7OBE92oRrp4=; b=V72LYJLmSqZNoUBHWgyr3v2GC4bLCXSHGspwUhtLRvbOfNau1uDwwAkL2s0Rv+gYC0 sI99Ax4S5E0+9h99N43UVlVwdksgSH3kXMfoFaKO5dCkPgcF5JWtft3Id1k9LUZ0pXHS omkmxFthFQGL0SQeBbi/kKPQjnTrq9Ae43iawFYivgM9y+C9GE1fP/QUMndXddn1yHVz 3Wz05QkTyeUl+btxRRvtppzAbuMIobl4EwT1o9Ot6DmKmaY2w3ih3ELCOlBxRjqTuN8G 63wS08N+excFmVfhNJySnzrMiMQl8feImjoR+gnsRzp+fNMCLm4LsA43KFIelcEHx8i2 oOWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rRd+pWou; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bw19si10772131ejb.85.2021.03.22.03.46.16; Mon, 22 Mar 2021 03:46:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rRd+pWou; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230153AbhCVKpk (ORCPT + 99 others); Mon, 22 Mar 2021 06:45:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:55314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230174AbhCVKpU (ORCPT ); Mon, 22 Mar 2021 06:45:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C438B61937; Mon, 22 Mar 2021 10:45:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616409919; bh=PSDbuiA+J5uMCeFxNECOcgTK5RynWKPdyMjFLLCjnfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rRd+pWoue2HUGEFYmUF+B3GtWuJQn66Ps+jiriHMjPCnr05onQqvhfaCGn4vWIxKU og5ldKlnYmjxZWzPD1/IiVFPd7FBtwCXOWgvKswbueFHmufOY+4HdU65C6bPDcNr3O Afy+xSSVy3PMyYWko06pmweU3MQbGIFWgIzBo8plxdlwDQHTu66I6kH5owKoGO25Oe 2YSWMVBk1vzeHxLvFxFpMfpC+z1ACCw3y8YWSq/1XJcxVoR8A1v0JiDAo6VZn41/8P BGcZqQepkqZy9hWUnXrDkr6sUuzgMDzwhKHGhovQ82Y7gvgu77Q402IE3qOo+iSbmz GWpNZb8nuS7Ag== From: Arnd Bergmann To: netdev@vger.kernel.org, Kalle Valo , "David S. Miller" , Jakub Kicinski Cc: Arnd Bergmann , Jason Yan , Lubomir Rintel , libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 4/5] libertas: avoid -Wempty-body warning Date: Mon, 22 Mar 2021 11:43:34 +0100 Message-Id: <20210322104343.948660-4-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210322104343.948660-1-arnd@kernel.org> References: <20210322104343.948660-1-arnd@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Arnd Bergmann Building without mesh supports shows a couple of warnings with 'make W=1': drivers/net/wireless/marvell/libertas/main.c: In function 'lbs_start_card': drivers/net/wireless/marvell/libertas/main.c:1068:37: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] 1068 | lbs_start_mesh(priv); Change the macros to use the usual "do { } while (0)" instead to shut up the warnings and make the code a litte more robust. Signed-off-by: Arnd Bergmann --- drivers/net/wireless/marvell/libertas/mesh.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/marvell/libertas/mesh.h b/drivers/net/wireless/marvell/libertas/mesh.h index d49717b20c09..44c4cd0230a8 100644 --- a/drivers/net/wireless/marvell/libertas/mesh.h +++ b/drivers/net/wireless/marvell/libertas/mesh.h @@ -60,13 +60,13 @@ void lbs_mesh_ethtool_get_strings(struct net_device *dev, #else -#define lbs_init_mesh(priv) -#define lbs_deinit_mesh(priv) -#define lbs_start_mesh(priv) -#define lbs_add_mesh(priv) -#define lbs_remove_mesh(priv) +#define lbs_init_mesh(priv) do { } while (0) +#define lbs_deinit_mesh(priv) do { } while (0) +#define lbs_start_mesh(priv) do { } while (0) +#define lbs_add_mesh(priv) do { } while (0) +#define lbs_remove_mesh(priv) do { } while (0) #define lbs_mesh_set_dev(priv, dev, rxpd) (dev) -#define lbs_mesh_set_txpd(priv, dev, txpd) +#define lbs_mesh_set_txpd(priv, dev, txpd) do { } while (0) #define lbs_mesh_set_channel(priv, channel) (0) #define lbs_mesh_activated(priv) (false) -- 2.29.2