> -----Original Message----- > From: linux-scsi-owner@xxxxxxxxxxxxxxx [mailto:linux-scsi- > owner@xxxxxxxxxxxxxxx] On Behalf Of Christoph Jaeger > Sent: Sunday, September 01, 2013 1:05 AM > To: James E.J. Bottomley > Cc: linux-scsi@xxxxxxxxxxxxxxx; Christoph Jaeger > Subject: [PATCH] scsi: bfa: Use ARRAY_SIZE > > Use ARRAY_SIZE to calculate the size of an array. > > Signed-off-by: Christoph Jaeger <christophjaeger@xxxxxxxxx> > --- > drivers/scsi/bfa/bfa_core.c | 2 +- > drivers/scsi/bfa/bfa_fcs.c | 10 ++++------ > 2 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/scsi/bfa/bfa_core.c b/drivers/scsi/bfa/bfa_core.c index > 520540a..4cc8763 100644 > --- a/drivers/scsi/bfa/bfa_core.c > +++ b/drivers/scsi/bfa/bfa_core.c > @@ -1941,7 +1941,7 @@ bfa_get_pciids(struct bfa_pciid_s **pciids, int > *npciids) > {BFA_PCI_VENDOR_ID_BROCADE, > BFA_PCI_DEVICE_ID_CT_FC}, > }; > > - *npciids = sizeof(__pciids) / sizeof(__pciids[0]); > + *npciids = ARRAY_SIZE(__pciids); > *pciids = __pciids; > } > > diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c index > a3ab5cc..6a00008 100644 > --- a/drivers/scsi/bfa/bfa_fcs.c > +++ b/drivers/scsi/bfa/bfa_fcs.c > @@ -81,7 +81,7 @@ bfa_fcs_attach(struct bfa_fcs_s *fcs, struct bfa_s *bfa, > struct bfad_s *bfad, > bfa->fcs = BFA_TRUE; > 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); > @@ -97,7 +97,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); > @@ -180,13 +180,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.8.3.1 > > -- Thanks for the patch Chris. Changes looks good. Acked-by: Vijaya Mohan Guvva <vmohan@xxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
