2010-06-28 11:55:21

by Kulikov Vasiliy

Subject: [PATCH 07/16] trivial: use ARRAY_SIZE

Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).

Signed-off-by: Kulikov Vasiliy <[email protected]>
---
drivers/scsi/bfa/bfa_fcs.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
index 3516172..153cb2a 100644
--- a/drivers/scsi/bfa/bfa_fcs.c
+++ b/drivers/scsi/bfa/bfa_fcs.c
@@ -86,7 +86,7 @@ bfa_fcs_attach(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad,
bfa_attach_fcs(bfa);
fcbuild_init();

- for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {
+ for (i = 0; i < ARRAY_SIZE(fcs_modules); i++) {
mod = &fcs_modules[i];
if (mod->attach)
mod->attach(fcs);
@@ -102,7 +102,7 @@ bfa_fcs_init(struct bfa_fcs_s *fcs)
int i;
struct bfa_fcs_mod_s *mod;

- for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {
+ for (i = 0; i < ARRAY_SIZE(fcs_modules); i++) {
mod = &fcs_modules[i];
if (mod->modinit)
mod->modinit(fcs);
@@ -163,13 +163,11 @@ void
bfa_fcs_exit(struct bfa_fcs_s *fcs)
{
struct bfa_fcs_mod_s *mod;
- int nmods, i;
+ int i;

bfa_wc_init(&fcs->wc, bfa_fcs_exit_comp, fcs);

- nmods = sizeof(fcs_modules) / sizeof(fcs_modules[0]);
-
- for (i = 0; i < nmods; i++) {
+ for (i = 0; i < ARRAY_SIZE(fcs_modules); i++) {

mod = &fcs_modules[i];
if (mod->modexit) {
--
1.7.0.4

2010-07-20 15:13:25

by Jiri Kosina

Subject: Re: [PATCH 07/16] trivial: use ARRAY_SIZE

On Mon, 28 Jun 2010, Kulikov Vasiliy wrote:

> Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).
>
> Signed-off-by: Kulikov Vasiliy <[email protected]>
> ---
> drivers/scsi/bfa/bfa_fcs.c | 10 ++++------
> 1 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
> index 3516172..153cb2a 100644
> --- a/drivers/scsi/bfa/bfa_fcs.c
> +++ b/drivers/scsi/bfa/bfa_fcs.c
> @@ -86,7 +86,7 @@ bfa_fcs_attach(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad,
> bfa_attach_fcs(bfa);
> fcbuild_init();
>
> - for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {
> + for (i = 0; i < ARRAY_SIZE(fcs_modules); i++) {
> mod = &fcs_modules[i];
> if (mod->attach)
> mod->attach(fcs);
> @@ -102,7 +102,7 @@ bfa_fcs_init(struct bfa_fcs_s *fcs)
> int i;
> struct bfa_fcs_mod_s *mod;
>
> - for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {
> + for (i = 0; i < ARRAY_SIZE(fcs_modules); i++) {
> mod = &fcs_modules[i];
> if (mod->modinit)
> mod->modinit(fcs);
> @@ -163,13 +163,11 @@ void
> bfa_fcs_exit(struct bfa_fcs_s *fcs)
> {
> struct bfa_fcs_mod_s *mod;
> - int nmods, i;
> + int i;
>
> bfa_wc_init(&fcs->wc, bfa_fcs_exit_comp, fcs);
>
> - nmods = sizeof(fcs_modules) / sizeof(fcs_modules[0]);
> -
> - for (i = 0; i < nmods; i++) {
> + for (i = 0; i < ARRAY_SIZE(fcs_modules); i++) {
>
> mod = &fcs_modules[i];
> if (mod->modexit) {

I have folded this patch into the other bfa change you made, and applied.
Thanks,

--
Jiri Kosina
SUSE Labs, Novell Inc.