From: Florian Bezdeka <florian.bezdeka@siemens.com>
To: jan.kiszka@siemens.com, xenomai@lists.linux.dev
Cc: Florian Bezdeka <florian.bezdeka@siemens.com>
Subject: [PATCH 04/13] kernel/drivers: Mirate to ARRAY_SIZE()
Date: Tue, 05 Dec 2023 13:41:41 +0100 [thread overview]
Message-ID: <20231201-flo-array-size-v1-4-3e0abd7c68fa@siemens.com> (raw)
In-Reply-To: <20231201-flo-array-size-v1-0-3e0abd7c68fa@siemens.com>
Use ARRAY_SIZE() where possible. No functional change.
Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
kernel/drivers/analogy/national_instruments/mio_common.c | 6 ++----
kernel/drivers/analogy/national_instruments/ni_670x.c | 2 +-
kernel/drivers/analogy/national_instruments/ni_stc.h | 4 ++--
kernel/drivers/analogy/national_instruments/pcimio.c | 2 +-
kernel/drivers/net/drivers/experimental/e1000/e1000_80003es2lan.c | 3 +--
kernel/drivers/net/drivers/experimental/e1000/e1000_82541.c | 3 +--
kernel/drivers/net/drivers/experimental/e1000/e1000_phy.c | 6 ++----
kernel/drivers/net/drivers/igb/e1000_phy.c | 6 ++----
8 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/kernel/drivers/analogy/national_instruments/mio_common.c b/kernel/drivers/analogy/national_instruments/mio_common.c
index 82b1da525..92f403d7b 100644
--- a/kernel/drivers/analogy/national_instruments/mio_common.c
+++ b/kernel/drivers/analogy/national_instruments/mio_common.c
@@ -1212,8 +1212,7 @@ static void ni_ai_fifo_read(struct a4l_subdevice *subd, int n)
a4l_buf_put(subd, &data[0], sizeof(sampl_t));
}
} else {
- if (n > sizeof(devpriv->ai_fifo_buffer) /
- sizeof(devpriv->ai_fifo_buffer[0])) {
+ if (n > ARRAY_SIZE(devpriv->ai_fifo_buffer)) {
a4l_err(dev,
"ni_ai_fifo_read: "
"bug! ai_fifo_buffer too small");
@@ -1325,8 +1324,7 @@ static void ni_handle_fifo_dregs(struct a4l_subdevice *subd)
while (fifo_empty == 0) {
for (i = 0;
i <
- sizeof(devpriv->ai_fifo_buffer) /
- sizeof(devpriv->ai_fifo_buffer[0]); i++) {
+ ARRAY_SIZE(devpriv->ai_fifo_buffer); i++) {
fifo_empty =
devpriv->stc_readw(dev,
AI_Status_1_Register) &
diff --git a/kernel/drivers/analogy/national_instruments/ni_670x.c b/kernel/drivers/analogy/national_instruments/ni_670x.c
index 35749be69..597e2dd2b 100644
--- a/kernel/drivers/analogy/national_instruments/ni_670x.c
+++ b/kernel/drivers/analogy/national_instruments/ni_670x.c
@@ -212,7 +212,7 @@ static const struct ni_670x_board ni_670x_boards[] = {
},
};
-#define n_ni_670x_boards ((sizeof(ni_670x_boards)/sizeof(ni_670x_boards[0])))
+#define n_ni_670x_boards ARRAY_SIZE(ni_670x_boards)
static const struct pci_device_id ni_670x_pci_table[] = {
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2c90)},
diff --git a/kernel/drivers/analogy/national_instruments/ni_stc.h b/kernel/drivers/analogy/national_instruments/ni_stc.h
index d600a3204..85fd86f18 100644
--- a/kernel/drivers/analogy/national_instruments/ni_stc.h
+++ b/kernel/drivers/analogy/national_instruments/ni_stc.h
@@ -1027,7 +1027,7 @@ static inline int M_Offset_Static_AI_Control(int i)
0x262,
0x263,
};
- if(((unsigned)i) >= sizeof(offset) / sizeof(offset[0]))
+ if(((unsigned)i) >= ARRAY_SIZE(offset))
{
rtdm_printk("%s: invalid channel=%i\n", __FUNCTION__, i);
return offset[0];
@@ -1043,7 +1043,7 @@ static inline int M_Offset_AO_Reference_Attenuation(int channel)
0x266,
0x267
};
- if(((unsigned)channel) >= sizeof(offset) / sizeof(offset[0]))
+ if(((unsigned)channel) >= ARRAY_SIZE(offset))
{
rtdm_printk("%s: invalid channel=%i\n", __FUNCTION__, channel);
return offset[0];
diff --git a/kernel/drivers/analogy/national_instruments/pcimio.c b/kernel/drivers/analogy/national_instruments/pcimio.c
index 8a3cccc81..40ca8f76d 100644
--- a/kernel/drivers/analogy/national_instruments/pcimio.c
+++ b/kernel/drivers/analogy/national_instruments/pcimio.c
@@ -1104,7 +1104,7 @@ static ni_board ni_boards[]={
.caldac = {ad8804_debug,ad8804_debug},
},
};
-#define n_pcimio_boards ((sizeof(ni_boards)/sizeof(ni_boards[0])))
+#define n_pcimio_boards ARRAY_SIZE(ni_boards)
/* How we access STC registers */
diff --git a/kernel/drivers/net/drivers/experimental/e1000/e1000_80003es2lan.c b/kernel/drivers/net/drivers/experimental/e1000/e1000_80003es2lan.c
index 2ef70d67d..e8e2f1de4 100644
--- a/kernel/drivers/net/drivers/experimental/e1000/e1000_80003es2lan.c
+++ b/kernel/drivers/net/drivers/experimental/e1000/e1000_80003es2lan.c
@@ -73,8 +73,7 @@ static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw);
static const u16 e1000_gg82563_cable_length_table[] =
{ 0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF };
#define GG82563_CABLE_LENGTH_TABLE_SIZE \
- (sizeof(e1000_gg82563_cable_length_table) / \
- sizeof(e1000_gg82563_cable_length_table[0]))
+ ARRAY_SIZE(e1000_gg82563_cable_length_table)
/**
* e1000_init_phy_params_80003es2lan - Init ESB2 PHY func ptrs.
diff --git a/kernel/drivers/net/drivers/experimental/e1000/e1000_82541.c b/kernel/drivers/net/drivers/experimental/e1000/e1000_82541.c
index a0d5c8801..5103dbefa 100644
--- a/kernel/drivers/net/drivers/experimental/e1000/e1000_82541.c
+++ b/kernel/drivers/net/drivers/experimental/e1000/e1000_82541.c
@@ -66,8 +66,7 @@ static const u16 e1000_igp_cable_length_table[] =
100, 100, 100, 100, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110,
110, 110, 110, 110, 110, 110, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120};
#define IGP01E1000_AGC_LENGTH_TABLE_SIZE \
- (sizeof(e1000_igp_cable_length_table) / \
- sizeof(e1000_igp_cable_length_table[0]))
+ ARRAY_SIZE(e1000_igp_cable_length_table)
struct e1000_dev_spec_82541 {
e1000_dsp_config dsp_config;
diff --git a/kernel/drivers/net/drivers/experimental/e1000/e1000_phy.c b/kernel/drivers/net/drivers/experimental/e1000/e1000_phy.c
index cec2ba360..0c7913d6e 100644
--- a/kernel/drivers/net/drivers/experimental/e1000/e1000_phy.c
+++ b/kernel/drivers/net/drivers/experimental/e1000/e1000_phy.c
@@ -37,8 +37,7 @@ static s32 e1000_acquire_phy(struct e1000_hw *hw);
static const u16 e1000_m88_cable_length_table[] =
{ 0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
#define M88E1000_CABLE_LENGTH_TABLE_SIZE \
- (sizeof(e1000_m88_cable_length_table) / \
- sizeof(e1000_m88_cable_length_table[0]))
+ ARRAY_SIZE(e1000_m88_cable_length_table)
static const u16 e1000_igp_2_cable_length_table[] =
{ 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21,
@@ -50,8 +49,7 @@ static const u16 e1000_igp_2_cable_length_table[] =
83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,
104, 109, 114, 118, 121, 124};
#define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \
- (sizeof(e1000_igp_2_cable_length_table) / \
- sizeof(e1000_igp_2_cable_length_table[0]))
+ ARRAY_SIZE(e1000_igp_2_cable_length_table)
/**
* e1000_check_reset_block_generic - Check if PHY reset is blocked
diff --git a/kernel/drivers/net/drivers/igb/e1000_phy.c b/kernel/drivers/net/drivers/igb/e1000_phy.c
index 8d740899c..fb069b0a7 100644
--- a/kernel/drivers/net/drivers/igb/e1000_phy.c
+++ b/kernel/drivers/net/drivers/igb/e1000_phy.c
@@ -38,8 +38,7 @@ static s32 igb_set_master_slave_mode(struct e1000_hw *hw);
static const u16 e1000_m88_cable_length_table[] = {
0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
#define M88E1000_CABLE_LENGTH_TABLE_SIZE \
- (sizeof(e1000_m88_cable_length_table) / \
- sizeof(e1000_m88_cable_length_table[0]))
+ ARRAY_SIZE(e1000_m88_cable_length_table)
static const u16 e1000_igp_2_cable_length_table[] = {
0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21,
@@ -51,8 +50,7 @@ static const u16 e1000_igp_2_cable_length_table[] = {
83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,
104, 109, 114, 118, 121, 124};
#define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \
- (sizeof(e1000_igp_2_cable_length_table) / \
- sizeof(e1000_igp_2_cable_length_table[0]))
+ ARRAY_SIZE(e1000_igp_2_cable_length_table)
/**
* igb_check_reset_block - Check if PHY reset is blocked
--
2.39.2
next prev parent reply other threads:[~2023-12-05 12:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 12:41 [PATCH 00/13] Migration to ARRAY_SIZE() and further include cleanups Florian Bezdeka
2023-12-05 12:41 ` [PATCH 01/13] testsuite: Migrate to ARRAY_SIZE() Florian Bezdeka
2023-12-05 12:41 ` [PATCH 02/13] demo: " Florian Bezdeka
2023-12-05 12:41 ` [PATCH 03/13] lib: " Florian Bezdeka
2023-12-05 12:41 ` Florian Bezdeka [this message]
2023-12-05 12:41 ` [PATCH 05/13] demo: Cleanup includes Florian Bezdeka
2023-12-05 12:41 ` [PATCH 06/13] lib/alchemy: " Florian Bezdeka
2023-12-05 12:41 ` [PATCH 07/13] lib/analogy: " Florian Bezdeka
2023-12-05 12:41 ` [PATCH 08/13] lib/boilerplate: " Florian Bezdeka
2023-12-05 12:41 ` [PATCH 09/13] lib/copperplate: " Florian Bezdeka
2023-12-05 12:41 ` [PATCH 10/13] lib/psos: " Florian Bezdeka
2023-12-05 12:41 ` [PATCH 11/13] lib/smokey: " Florian Bezdeka
2023-12-05 12:41 ` [PATCH 12/13] lib/trank: " Florian Bezdeka
2023-12-05 12:41 ` [PATCH 13/13] lib/vxworks: " Florian Bezdeka
2023-12-07 2:37 ` [PATCH 00/13] Migration to ARRAY_SIZE() and further include cleanups Jan Kiszka
2023-12-07 9:13 ` Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231201-flo-array-size-v1-4-3e0abd7c68fa@siemens.com \
--to=florian.bezdeka@siemens.com \
--cc=jan.kiszka@siemens.com \
--cc=xenomai@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.