Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
  Documentation: update broken web addresses.
  fix comment typo "choosed" -> "chosen"
  hostap:hostap_hw.c Fix typo in comment
  Fix spelling contorller -> controller in comments
  Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
  fs/Kconfig: Fix typo Userpace -> Userspace
  Removing dead MACH_U300_BS26
  drivers/infiniband: Remove unnecessary casts of private_data
  fs/ocfs2: Remove unnecessary casts of private_data
  libfc: use ARRAY_SIZE
  scsi: bfa: use ARRAY_SIZE
  drm: i915: use ARRAY_SIZE
  drm: drm_edid: use ARRAY_SIZE
  synclink: use ARRAY_SIZE
  block: cciss: use ARRAY_SIZE
  comment typo fixes: charater => character
  fix comment typos concerning "challenge"
  arm: plat-spear: fix typo in kerneldoc
  reiserfs: typo comment fix
  update email address
  ...

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
index 3ec2f49de61d..d1a99209bf5f 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);
@@ -103,7 +103,7 @@ bfa_fcs_init(struct bfa_fcs_s *fcs)
         struct bfa_fcs_mod_s  *mod;
         struct bfi_pbc_vport_s pbc_vports[BFI_PBC_MAX_VPORTS];
 
-        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);
@@ -171,13 +171,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) {