This small patch series improves the card_status[] array in ray_cs.c.
It essentially replaces comments describing the index with designated
initializers using enum constants as indexes.
It also makes the array const because it shouldn't be modified at
runtime.
Benjamin Stürz (2):
ray_cs: Improve card_status[]
ray_cs: Make card_status[] const
drivers/net/wireless/ray_cs.c | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
--
2.35.1
Replace comments with C99's designated initializers to improve
readability and maintainability.
Signed-off-by: Benjamin Stürz <[email protected]>
---
drivers/net/wireless/ray_cs.c | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 87e98ab068ed..3df795dc3d9f 100644
--- 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] = "???",
+ [CARD_INIT_ERROR] = "Card init error",
+ [CARD_DL_PARAM_ERROR] = "Download parameters error",
+ [13] = "???",
+ [CARD_ACQ_FAILED] = "Acquisition failed",
+ [CARD_AUTH_REFUSED] = "Authentication refused",
+ [CARD_ASSOC_FAILED] = "Association failed"
};
static const char *nettype[] = { "Adhoc", "Infra " };
--
2.35.1