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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2796C433F5 for ; Wed, 6 Apr 2022 19:07:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230181AbiDFTJJ (ORCPT ); Wed, 6 Apr 2022 15:09:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230379AbiDFTHh (ORCPT ); Wed, 6 Apr 2022 15:07:37 -0400 Received: from relay4.hostedemail.com (relay4.hostedemail.com [64.99.140.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F29B2AF242 for ; Wed, 6 Apr 2022 10:58:41 -0700 (PDT) Received: from omf13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C613E35D0; Wed, 6 Apr 2022 17:58:39 +0000 (UTC) Received: from [HIDDEN] (Authenticated sender: joe@perches.com) by omf13.hostedemail.com (Postfix) with ESMTPA id AA85120011; Wed, 6 Apr 2022 17:58:37 +0000 (UTC) Message-ID: <1064228a2bb8a5fbdcb483295c641c100dd08c9f.camel@perches.com> Subject: Re: [PATCH v4 1/2] ray_cs: Improve card_status[] From: Joe Perches To: Benjamin =?ISO-8859-1?Q?St=FCrz?= , kvalo@kernel.org Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 06 Apr 2022 10:58:35 -0700 In-Reply-To: <20220406152247.386267-2-benni@stuerz.xyz> References: <20220406152247.386267-1-benni@stuerz.xyz> <20220406152247.386267-2-benni@stuerz.xyz> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.40.4-1ubuntu2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 4x93hygzkp67pzsimy8pxrem6idwkheg X-Rspamd-Server: rspamout04 X-Rspamd-Queue-Id: AA85120011 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Session-ID: U2FsdGVkX18okezJojRz1U2N98r1sNAPyIQfCdYT8Jw= X-HE-Tag: 1649267917-578212 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2022-04-06 at 17:22 +0200, Benjamin Stürz wrote: > Replace comments with C99's designated initializers to improve > readability and maintainability. [] > diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c [] > @@ -2529,20 +2529,23 @@ static void clear_interrupt(ray_dev_t *local) > #define MAXDATA (PAGE_SIZE - 80) > > static const char *card_status[] = { > - "Card inserted - uninitialized", /* 0 */ > - "Card not downloaded", /* 1 */ > - "Waiting for download parameters", /* 2 */ > - "Card doing acquisition", /* 3 */ > - "Acquisition complete", /* 4 */ > - "Authentication complete", /* 5 */ > - "Association complete", /* 6 */ > - "???", "???", "???", "???", /* 7 8 9 10 undefined */ > - "Card init error", /* 11 */ > - "Download parameters error", /* 12 */ > - "???", /* 13 */ > - "Acquisition failed", /* 14 */ > - "Authentication refused", /* 15 */ > - "Association failed" /* 16 */ > + [CARD_INSERTED] = "Card inserted - uninitialized", > + [CARD_AWAITING_PARAM] = "Card not downloaded", > + [CARD_DL_PARAM] = "Waiting for download parameters", > + [CARD_DOING_ACQ] = "Card doing acquisition", > + [CARD_ACQ_COMPLETE] = "Acquisition complete", > + [CARD_AUTH_COMPLETE] = "Authentication complete", > + [CARD_ASSOC_COMPLETE] = "Association complete", > + [7] = "???", > + [8] = "???", > + [9] = "???", > + [10] = "???", Rather than using specific numbers and "???" it's probably better to use no initialization at all and change the output call to test the array index ao all of the [number] = "???" could be removed. --- drivers/net/wireless/ray_cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 87e98ab068ed..29451cd0a22a 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -2600,7 +2600,7 @@ static int ray_cs_proc_show(struct seq_file *m, void *v) i = 10; if (i > 16) i = 10; - seq_printf(m, "Card status = %s\n", card_status[i]); + seq_printf(m, "Card status = %s\n", card_status[i] ?: "???"); seq_printf(m, "Framing mode = %s\n", framing[translate]);