[SCSI] bfa: fix formating and checkpatch issues
authorJing Huang <huangj@brocade.com>
Wed, 16 Nov 2011 20:28:49 +0000 (12:28 -0800)
committerJames Bottomley <JBottomley@Parallels.com>
Thu, 15 Dec 2011 06:55:01 +0000 (10:55 +0400)
Fixed code indentation and alignment issues.
Fixed all checkpatch warnings.

Signed-off-by: Jing Huang <huangj@brocade.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/bfa/bfa_defs_svc.h
drivers/scsi/bfa/bfad_debugfs.c

index 863c6ba7d5eb0c817bfa7f3975a9d3de981cc8be..78963be2c4fb308f09df6f38b3cf5097b3bb5f53 100644 (file)
 struct bfa_iocfc_intr_attr_s {
        u8              coalesce;       /*  enable/disable coalescing */
        u8              rsvd[3];
-       __be16  latency;        /*  latency in microseconds   */
-       __be16  delay;          /*  delay in microseconds     */
+       __be16          latency;        /*  latency in microseconds   */
+       __be16          delay;          /*  delay in microseconds     */
 };
 
 /*
  * IOC firmware configuraton
  */
 struct bfa_iocfc_fwcfg_s {
-       u16        num_fabrics; /*  number of fabrics           */
-       u16        num_lports;  /*  number of local lports      */
-       u16        num_rports;  /*  number of remote ports      */
-       u16        num_ioim_reqs;       /*  number of IO reqs           */
-       u16        num_tskim_reqs;      /*  task management requests    */
-       u16        num_fwtio_reqs;      /* number of TM IO reqs in FW */
-       u16        num_fcxp_reqs;       /*  unassisted FC exchanges     */
-       u16        num_uf_bufs; /*  unsolicited recv buffers    */
+       u16             num_fabrics;    /*  number of fabrics           */
+       u16             num_lports;     /*  number of local lports      */
+       u16             num_rports;     /*  number of remote ports      */
+       u16             num_ioim_reqs;  /*  number of IO reqs           */
+       u16             num_tskim_reqs; /*  task management requests    */
+       u16             num_fwtio_reqs; /* number of TM IO reqs in FW   */
+       u16             num_fcxp_reqs;  /*  unassisted FC exchanges     */
+       u16             num_uf_bufs;    /*  unsolicited recv buffers    */
        u8              num_cqs;
        u8              fw_tick_res;    /*  FW clock resolution in ms */
        u8              rsvd[2];
@@ -57,19 +57,19 @@ struct bfa_iocfc_fwcfg_s {
 #pragma pack()
 
 struct bfa_iocfc_drvcfg_s {
-       u16        num_reqq_elems;      /*  number of req queue elements */
-       u16        num_rspq_elems;      /*  number of rsp queue elements */
-       u16        num_sgpgs;   /*  number of total SG pages      */
-       u16        num_sboot_tgts;      /*  number of SAN boot targets    */
-       u16        num_sboot_luns;      /*  number of SAN boot luns       */
-       u16         ioc_recover;        /*  IOC recovery mode             */
-       u16         min_cfg;    /*  minimum configuration         */
-       u16        path_tov;    /*  device path timeout   */
-       u16             num_tio_reqs;   /*!< number of TM IO reqs       */
+       u16             num_reqq_elems; /*  number of req queue elements */
+       u16             num_rspq_elems; /*  number of rsp queue elements */
+       u16             num_sgpgs;      /*  number of total SG pages     */
+       u16             num_sboot_tgts; /*  number of SAN boot targets   */
+       u16             num_sboot_luns; /*  number of SAN boot luns      */
+       u16             ioc_recover;    /*  IOC recovery mode            */
+       u16             min_cfg;        /*  minimum configuration        */
+       u16             path_tov;       /*  device path timeout         */
+       u16             num_tio_reqs;   /* number of TM IO reqs */
        u8              port_mode;
        u8              rsvd_a;
-       bfa_boolean_t   delay_comp; /*  delay completion of
-                                                       failed inflight IOs */
+       bfa_boolean_t   delay_comp;     /* delay completion of failed
+                                        * inflight IOs */
        u16             num_ttsk_reqs;   /* TM task management requests */
        u32             rsvd;
 };
@@ -101,8 +101,8 @@ struct bfa_fw_ioim_stats_s {
        u32     fw_frm_drop;            /*  f/w drop the frame */
 
        u32     rec_timeout;            /*  FW rec timed out */
-       u32     error_rec;                      /*  FW sending rec on
-                                                       * an error condition*/
+       u32     error_rec;              /*  FW sending rec on
+                                         an error condition*/
        u32     wait_for_si;            /*  FW wait for SI */
        u32     rec_rsp_inval;          /*  REC rsp invalid */
        u32     seqr_io_abort;          /*  target does not know cmd so abort */
@@ -124,9 +124,9 @@ struct bfa_fw_ioim_stats_s {
        u32     unexp_fcp_rsp;          /*  fcp response in wrong state */
 
        u32     fcp_rsp_under_run;      /*  fcp rsp IO underrun */
-       u32        fcp_rsp_under_run_wr;   /*  fcp rsp IO underrun for write */
+       u32     fcp_rsp_under_run_wr;   /*  fcp rsp IO underrun for write */
        u32     fcp_rsp_under_run_err;  /*  fcp rsp IO underrun error */
-       u32        fcp_rsp_resid_inval;    /*  invalid residue */
+       u32     fcp_rsp_resid_inval;    /*  invalid residue */
        u32     fcp_rsp_over_run;       /*  fcp rsp IO overrun */
        u32     fcp_rsp_over_run_err;   /*  fcp rsp IO overrun error */
        u32     fcp_rsp_proto_err;      /*  protocol error in fcp rsp */
@@ -142,21 +142,20 @@ struct bfa_fw_ioim_stats_s {
        u32     ioh_hit_class2_event;   /*  IOH hit class2 */
        u32     ioh_miss_other_event;   /*  IOH miss other */
        u32     ioh_seq_cnt_err_event;  /*  IOH seq cnt error */
-       u32     ioh_len_err_event;              /*  IOH len error - fcp_dl !=
-                                                       * bytes xfered */
+       u32     ioh_len_err_event;      /*  IOH len error - fcp_dl !=
+                                         bytes xfered */
        u32     ioh_seq_len_err_event;  /*  IOH seq len error */
        u32     ioh_data_oor_event;     /*  Data out of range */
        u32     ioh_ro_ooo_event;       /*  Relative offset out of range */
        u32     ioh_cpu_owned_event;    /*  IOH hit -iost owned by f/w */
        u32     ioh_unexp_frame_event;  /*  unexpected frame received
-                                                *   count */
+                                        *  count */
        u32     ioh_err_int;            /*  IOH error int during data-phase
-                                                *   for scsi write
-                                                */
+                                        *  for scsi write */
 };
 
 struct bfa_fw_tio_stats_s {
-       u32     tio_conf_proc;  /* TIO CONF processed */
+       u32     tio_conf_proc;      /* TIO CONF processed */
        u32     tio_conf_drop;      /* TIO CONF dropped */
        u32     tio_cleanup_req;    /* TIO cleanup requested */
        u32     tio_cleanup_comp;   /* TIO cleanup completed */
@@ -164,34 +163,36 @@ struct bfa_fw_tio_stats_s {
        u32     tio_abort_rsp_comp; /* TIO abort rsp completed */
        u32     tio_abts_req;       /* TIO ABTS requested */
        u32     tio_abts_ack;       /* TIO ABTS ack-ed */
-       u32     tio_abts_ack_nocomp; /* TIO ABTS ack-ed but not completed */
+       u32     tio_abts_ack_nocomp;/* TIO ABTS ack-ed but not completed */
        u32     tio_abts_tmo;       /* TIO ABTS timeout */
        u32     tio_snsdata_dma;    /* TIO sense data DMA */
-       u32     tio_rxwchan_wait; /* TIO waiting for RX wait channel */
-       u32     tio_rxwchan_avail; /* TIO RX wait channel available */
+       u32     tio_rxwchan_wait;   /* TIO waiting for RX wait channel */
+       u32     tio_rxwchan_avail;  /* TIO RX wait channel available */
        u32     tio_hit_bls;        /* TIO IOH BLS event */
        u32     tio_uf_recv;        /* TIO received UF */
-       u32     tio_rd_invalid_sm; /* TIO read reqst in wrong state machine */
-       u32     tio_wr_invalid_sm;/* TIO write reqst in wrong state machine */
+       u32     tio_rd_invalid_sm;  /* TIO read reqst in wrong state machine */
+       u32     tio_wr_invalid_sm;  /* TIO write reqst in wrong state machine */
 
-       u32     ds_rxwchan_wait; /* DS waiting for RX wait channel */
-       u32     ds_rxwchan_avail; /* DS RX wait channel available */
+       u32     ds_rxwchan_wait;    /* DS waiting for RX wait channel */
+       u32     ds_rxwchan_avail;   /* DS RX wait channel available */
        u32     ds_unaligned_rd;    /* DS unaligned read */
-       u32     ds_rdcomp_invalid_sm; /* DS read completed in wrong state machine */
-       u32     ds_wrcomp_invalid_sm; /* DS write completed in wrong state machine */
+       u32     ds_rdcomp_invalid_sm; /* DS read completed in wrong state
+                                      * machine */
+       u32     ds_wrcomp_invalid_sm; /* DS write completed in wrong state
+                                      * machine */
        u32     ds_flush_req;       /* DS flush requested */
        u32     ds_flush_comp;      /* DS flush completed */
        u32     ds_xfrdy_exp;       /* DS XFER_RDY expired */
        u32     ds_seq_cnt_err;     /* DS seq cnt error */
        u32     ds_seq_len_err;     /* DS seq len error */
        u32     ds_data_oor;        /* DS data out of order */
-       u32     ds_hit_bls;     /* DS hit BLS */
+       u32     ds_hit_bls;         /* DS hit BLS */
        u32     ds_edtov_timer_exp; /* DS edtov expired */
        u32     ds_cpu_owned;       /* DS cpu owned */
        u32     ds_hit_class2;      /* DS hit class2 */
        u32     ds_length_err;      /* DS length error */
        u32     ds_ro_ooo_err;      /* DS relative offset out-of-order error */
-       u32     ds_rectov_timer_exp;    /* DS rectov expired */
+       u32     ds_rectov_timer_exp;/* DS rectov expired */
        u32     ds_unexp_fr_err;    /* DS unexp frame error */
 };
 
@@ -208,119 +209,119 @@ struct bfa_fw_io_stats_s {
  */
 
 struct bfa_fw_port_fpg_stats_s {
-    u32    intr_evt;
-    u32    intr;
-    u32    intr_excess;
-    u32    intr_cause0;
-    u32    intr_other;
-    u32    intr_other_ign;
-    u32    sig_lost;
-    u32    sig_regained;
-    u32    sync_lost;
-    u32    sync_to;
-    u32    sync_regained;
-    u32    div2_overflow;
-    u32    div2_underflow;
-    u32    efifo_overflow;
-    u32    efifo_underflow;
-    u32    idle_rx;
-    u32    lrr_rx;
-    u32    lr_rx;
-    u32    ols_rx;
-    u32    nos_rx;
-    u32    lip_rx;
-    u32    arbf0_rx;
-    u32    arb_rx;
-    u32    mrk_rx;
-    u32    const_mrk_rx;
-    u32    prim_unknown;
+       u32    intr_evt;
+       u32    intr;
+       u32    intr_excess;
+       u32    intr_cause0;
+       u32    intr_other;
+       u32    intr_other_ign;
+       u32    sig_lost;
+       u32    sig_regained;
+       u32    sync_lost;
+       u32    sync_to;
+       u32    sync_regained;
+       u32    div2_overflow;
+       u32    div2_underflow;
+       u32    efifo_overflow;
+       u32    efifo_underflow;
+       u32    idle_rx;
+       u32    lrr_rx;
+       u32    lr_rx;
+       u32    ols_rx;
+       u32    nos_rx;
+       u32    lip_rx;
+       u32    arbf0_rx;
+       u32    arb_rx;
+       u32    mrk_rx;
+       u32    const_mrk_rx;
+       u32    prim_unknown;
 };
 
 
 struct bfa_fw_port_lksm_stats_s {
-    u32    hwsm_success;       /*  hwsm state machine success          */
-    u32    hwsm_fails;         /*  hwsm fails                          */
-    u32    hwsm_wdtov;         /*  hwsm timed out                      */
-    u32    swsm_success;       /*  swsm success                        */
-    u32    swsm_fails;         /*  swsm fails                          */
-    u32    swsm_wdtov;         /*  swsm timed out                      */
-    u32    busybufs;           /*  link init failed due to busybuf     */
-    u32    buf_waits;          /*  bufwait state entries               */
-    u32    link_fails;         /*  link failures                       */
-    u32    psp_errors;         /*  primitive sequence protocol errors  */
-    u32    lr_unexp;           /*  No. of times LR rx-ed unexpectedly  */
-    u32    lrr_unexp;          /*  No. of times LRR rx-ed unexpectedly */
-    u32    lr_tx;              /*  No. of times LR tx started          */
-    u32    lrr_tx;             /*  No. of times LRR tx started         */
-    u32    ols_tx;             /*  No. of times OLS tx started         */
-    u32    nos_tx;             /*  No. of times NOS tx started         */
-    u32    hwsm_lrr_rx;        /*  No. of times LRR rx-ed by HWSM      */
-    u32    hwsm_lr_rx;         /*  No. of times LR rx-ed by HWSM      */
-       u32     bbsc_lr;        /* LKSM LR tx for credit recovery       */
+       u32    hwsm_success;       /*  hwsm state machine success          */
+       u32    hwsm_fails;         /*  hwsm fails                          */
+       u32    hwsm_wdtov;         /*  hwsm timed out                      */
+       u32    swsm_success;       /*  swsm success                        */
+       u32    swsm_fails;         /*  swsm fails                          */
+       u32    swsm_wdtov;         /*  swsm timed out                      */
+       u32    busybufs;           /*  link init failed due to busybuf     */
+       u32    buf_waits;          /*  bufwait state entries               */
+       u32    link_fails;         /*  link failures                       */
+       u32    psp_errors;         /*  primitive sequence protocol errors  */
+       u32    lr_unexp;           /*  No. of times LR rx-ed unexpectedly  */
+       u32    lrr_unexp;          /*  No. of times LRR rx-ed unexpectedly */
+       u32    lr_tx;              /*  No. of times LR tx started          */
+       u32    lrr_tx;             /*  No. of times LRR tx started         */
+       u32    ols_tx;             /*  No. of times OLS tx started         */
+       u32    nos_tx;             /*  No. of times NOS tx started         */
+       u32    hwsm_lrr_rx;        /*  No. of times LRR rx-ed by HWSM      */
+       u32    hwsm_lr_rx;         /*  No. of times LR rx-ed by HWSM       */
+       u32    bbsc_lr;            /* LKSM LR tx for credit recovery       */
 };
 
 struct bfa_fw_port_snsm_stats_s {
-    u32    hwsm_success;       /*  Successful hwsm terminations        */
-    u32    hwsm_fails;         /*  hwsm fail count                     */
-    u32    hwsm_wdtov;         /*  hwsm timed out                      */
-    u32    swsm_success;       /*  swsm success                        */
-    u32    swsm_wdtov;         /*  swsm timed out                      */
-    u32    error_resets;       /*  error resets initiated by upsm      */
-    u32    sync_lost;          /*  Sync loss count                     */
-    u32    sig_lost;           /*  Signal loss count                   */
-       u32     asn8g_attempts; /* SNSM HWSM at 8Gbps attempts */
+       u32    hwsm_success;       /*  Successful hwsm terminations        */
+       u32    hwsm_fails;         /*  hwsm fail count                     */
+       u32    hwsm_wdtov;         /*  hwsm timed out                      */
+       u32    swsm_success;       /*  swsm success                        */
+       u32    swsm_wdtov;         /*  swsm timed out                      */
+       u32    error_resets;       /*  error resets initiated by upsm      */
+       u32    sync_lost;          /*  Sync loss count                     */
+       u32    sig_lost;           /*  Signal loss count                   */
+       u32    asn8g_attempts;     /* SNSM HWSM at 8Gbps attempts          */
 };
 
 struct bfa_fw_port_physm_stats_s {
-    u32    module_inserts;     /*  Module insert count                 */
-    u32    module_xtracts;     /*  Module extracts count               */
-    u32    module_invalids;    /*  Invalid module inserted count       */
-    u32    module_read_ign;    /*  Module validation status ignored    */
-    u32    laser_faults;       /*  Laser fault count                   */
-    u32    rsvd;
+       u32    module_inserts;     /*  Module insert count                 */
+       u32    module_xtracts;     /*  Module extracts count               */
+       u32    module_invalids;    /*  Invalid module inserted count       */
+       u32    module_read_ign;    /*  Module validation status ignored    */
+       u32    laser_faults;       /*  Laser fault count                   */
+       u32    rsvd;
 };
 
 struct bfa_fw_fip_stats_s {
-    u32    vlan_req;           /*  vlan discovery requests             */
-    u32    vlan_notify;        /*  vlan notifications                  */
-    u32    vlan_err;           /*  vlan response error                 */
-    u32    vlan_timeouts;      /*  vlan disvoery timeouts              */
-    u32    vlan_invalids;      /*  invalid vlan in discovery advert.   */
-    u32    disc_req;           /*  Discovery solicit requests          */
-    u32    disc_rsp;           /*  Discovery solicit response          */
-    u32    disc_err;           /*  Discovery advt. parse errors        */
-    u32    disc_unsol;         /*  Discovery unsolicited               */
-    u32    disc_timeouts;      /*  Discovery timeouts                  */
-    u32    disc_fcf_unavail;   /*  Discovery FCF Not Avail.            */
-    u32    linksvc_unsupp;     /*  Unsupported link service req        */
-    u32    linksvc_err;        /*  Parse error in link service req     */
-    u32    logo_req;           /*  FIP logos received                  */
-    u32    clrvlink_req;       /*  Clear virtual link req              */
-    u32    op_unsupp;          /*  Unsupported FIP operation           */
-    u32    untagged;           /*  Untagged frames (ignored)           */
-    u32    invalid_version;    /*  Invalid FIP version                 */
+       u32    vlan_req;           /*  vlan discovery requests             */
+       u32    vlan_notify;        /*  vlan notifications                  */
+       u32    vlan_err;           /*  vlan response error                 */
+       u32    vlan_timeouts;      /*  vlan disvoery timeouts              */
+       u32    vlan_invalids;      /*  invalid vlan in discovery advert.   */
+       u32    disc_req;           /*  Discovery solicit requests          */
+       u32    disc_rsp;           /*  Discovery solicit response          */
+       u32    disc_err;           /*  Discovery advt. parse errors        */
+       u32    disc_unsol;         /*  Discovery unsolicited               */
+       u32    disc_timeouts;      /*  Discovery timeouts                  */
+       u32    disc_fcf_unavail;   /*  Discovery FCF Not Avail.            */
+       u32    linksvc_unsupp;     /*  Unsupported link service req        */
+       u32    linksvc_err;        /*  Parse error in link service req     */
+       u32    logo_req;           /*  FIP logos received                  */
+       u32    clrvlink_req;       /*  Clear virtual link req              */
+       u32    op_unsupp;          /*  Unsupported FIP operation           */
+       u32    untagged;           /*  Untagged frames (ignored)           */
+       u32    invalid_version;    /*  Invalid FIP version                 */
 };
 
 struct bfa_fw_lps_stats_s {
-    u32    mac_invalids;       /*  Invalid mac assigned                */
-    u32    rsvd;
+       u32    mac_invalids;       /*  Invalid mac assigned                */
+       u32    rsvd;
 };
 
 struct bfa_fw_fcoe_stats_s {
-    u32    cee_linkups;        /*  CEE link up count                   */
-    u32    cee_linkdns;        /*  CEE link down count                 */
-    u32    fip_linkups;        /*  FIP link up count                   */
-    u32    fip_linkdns;        /*  FIP link up count                   */
-    u32    fip_fails;          /*  FIP fail count                      */
-    u32    mac_invalids;       /*  Invalid mac assigned                */
+       u32    cee_linkups;        /*  CEE link up count                   */
+       u32    cee_linkdns;        /*  CEE link down count                 */
+       u32    fip_linkups;        /*  FIP link up count                   */
+       u32    fip_linkdns;        /*  FIP link up count                   */
+       u32    fip_fails;          /*  FIP fail count                      */
+       u32    mac_invalids;       /*  Invalid mac assigned                */
 };
 
 /*
  * IOC firmware FCoE port stats
  */
 struct bfa_fw_fcoe_port_stats_s {
-       struct bfa_fw_fcoe_stats_s  fcoe_stats;
-       struct bfa_fw_fip_stats_s   fip_stats;
+       struct bfa_fw_fcoe_stats_s              fcoe_stats;
+       struct bfa_fw_fip_stats_s               fip_stats;
 };
 
 /*
@@ -335,8 +336,8 @@ struct bfa_fw_fc_uport_stats_s {
  * IOC firmware FC port stats
  */
 union bfa_fw_fc_port_stats_s {
-       struct bfa_fw_fc_uport_stats_s  fc_stats;
-       struct bfa_fw_fcoe_port_stats_s fcoe_stats;
+       struct bfa_fw_fc_uport_stats_s          fc_stats;
+       struct bfa_fw_fcoe_port_stats_s         fcoe_stats;
 };
 
 /*
@@ -366,25 +367,25 @@ struct bfa_fw_lpsm_stats_s {
  */
 struct bfa_fw_trunk_stats_s {
        u32 emt_recvd;          /*  Trunk EMT received          */
-       u32 emt_accepted;               /*  Trunk EMT Accepted          */
-       u32 emt_rejected;               /*  Trunk EMT rejected          */
+       u32 emt_accepted;       /*  Trunk EMT Accepted          */
+       u32 emt_rejected;       /*  Trunk EMT rejected          */
        u32 etp_recvd;          /*  Trunk ETP received          */
-       u32 etp_accepted;               /*  Trunk ETP Accepted          */
-       u32 etp_rejected;               /*  Trunk ETP rejected          */
+       u32 etp_accepted;       /*  Trunk ETP Accepted          */
+       u32 etp_rejected;       /*  Trunk ETP rejected          */
        u32 lr_recvd;           /*  Trunk LR received           */
-       u32 rsvd;                       /*  padding for 64 bit alignment */
+       u32 rsvd;               /*  padding for 64 bit alignment */
 };
 
 struct bfa_fw_advsm_stats_s {
        u32 flogi_sent;         /*  Flogi sent                  */
        u32 flogi_acc_recvd;    /*  Flogi Acc received          */
        u32 flogi_rjt_recvd;    /*  Flogi rejects received      */
-       u32 flogi_retries;              /*  Flogi retries               */
+       u32 flogi_retries;      /*  Flogi retries               */
 
        u32 elp_recvd;          /*  ELP received                */
-       u32 elp_accepted;               /*  ELP Accepted                */
-       u32 elp_rejected;               /*  ELP rejected                */
-       u32 elp_dropped;                /*  ELP dropped         */
+       u32 elp_accepted;       /*  ELP Accepted                */
+       u32 elp_rejected;       /*  ELP rejected                */
+       u32 elp_dropped;        /*  ELP dropped                 */
 };
 
 /*
@@ -521,7 +522,7 @@ struct bfa_qos_vc_attr_s {
        u16  total_vc_count;                    /*  Total VC Count */
        u16  shared_credit;
        u32  elp_opmode_flags;
-       struct bfa_qos_vc_info_s vc_info[BFA_QOS_MAX_VC];  /*   as many as
+       struct bfa_qos_vc_info_s vc_info[BFA_QOS_MAX_VC];  /* as many as
                                                            * total_vc_count */
 };
 
@@ -531,16 +532,16 @@ struct bfa_qos_vc_attr_s {
 struct bfa_qos_stats_s {
        u32     flogi_sent;             /*  QoS Flogi sent */
        u32     flogi_acc_recvd;        /*  QoS Flogi Acc received */
-       u32     flogi_rjt_recvd; /*  QoS Flogi rejects received */
+       u32     flogi_rjt_recvd;        /*  QoS Flogi rejects received */
        u32     flogi_retries;          /*  QoS Flogi retries */
 
        u32     elp_recvd;              /*  QoS ELP received */
        u32     elp_accepted;           /*  QoS ELP Accepted */
-       u32     elp_rejected;       /*  QoS ELP rejected */
-       u32     elp_dropped;        /*  QoS ELP dropped  */
+       u32     elp_rejected;           /*  QoS ELP rejected */
+       u32     elp_dropped;            /*  QoS ELP dropped  */
 
-       u32     qos_rscn_recvd;     /*  QoS RSCN received */
-       u32     rsvd;               /* padding for 64 bit alignment */
+       u32     qos_rscn_recvd;         /*  QoS RSCN received */
+       u32     rsvd;                   /* padding for 64 bit alignment */
 };
 
 /*
@@ -548,9 +549,9 @@ struct bfa_qos_stats_s {
  */
 struct bfa_fcoe_stats_s {
        u64     secs_reset;     /*  Seconds since stats reset        */
-       u64     cee_linkups;    /*  CEE link up              */
+       u64     cee_linkups;    /*  CEE link up                      */
        u64     cee_linkdns;    /*  CEE link down                    */
-       u64     fip_linkups;    /*  FIP link up              */
+       u64     fip_linkups;    /*  FIP link up                      */
        u64     fip_linkdns;    /*  FIP link down                    */
        u64     fip_fails;      /*  FIP failures                     */
        u64     mac_invalids;   /*  Invalid mac assignments          */
@@ -560,38 +561,38 @@ struct bfa_fcoe_stats_s {
        u64     vlan_timeouts;  /*  Vlan request timeouts            */
        u64     vlan_invalids;  /*  Vlan invalids                    */
        u64     disc_req;       /*  Discovery requests               */
-       u64     disc_rsp;       /*  Discovery responses      */
+       u64     disc_rsp;       /*  Discovery responses              */
        u64     disc_err;       /*  Discovery error frames           */
        u64     disc_unsol;     /*  Discovery unsolicited            */
        u64     disc_timeouts;  /*  Discovery timeouts               */
        u64     disc_fcf_unavail; /*  Discovery FCF not avail        */
-       u64     linksvc_unsupp; /*  FIP link service req unsupp.    */
-       u64     linksvc_err;    /*  FIP link service req errors     */
+       u64     linksvc_unsupp; /*  FIP link service req unsupp      */
+       u64     linksvc_err;    /*  FIP link service req errors      */
        u64     logo_req;       /*  FIP logos received               */
-       u64     clrvlink_req;   /*  Clear virtual link requests     */
+       u64     clrvlink_req;   /*  Clear virtual link requests      */
        u64     op_unsupp;      /*  FIP operation unsupp.            */
-       u64     untagged;       /*  FIP untagged frames      */
+       u64     untagged;       /*  FIP untagged frames              */
        u64     txf_ucast;      /*  Tx FCoE unicast frames           */
-       u64     txf_ucast_vlan; /*  Tx FCoE unicast vlan frames     */
+       u64     txf_ucast_vlan; /*  Tx FCoE unicast vlan frames      */
        u64     txf_ucast_octets; /*  Tx FCoE unicast octets         */
        u64     txf_mcast;      /*  Tx FCoE multicast frames         */
-       u64     txf_mcast_vlan; /*  Tx FCoE multicast vlan frames   */
+       u64     txf_mcast_vlan; /*  Tx FCoE multicast vlan frames    */
        u64     txf_mcast_octets; /*  Tx FCoE multicast octets       */
        u64     txf_bcast;      /*  Tx FCoE broadcast frames         */
-       u64     txf_bcast_vlan; /*  Tx FCoE broadcast vlan frames   */
+       u64     txf_bcast_vlan; /*  Tx FCoE broadcast vlan frames    */
        u64     txf_bcast_octets; /*  Tx FCoE broadcast octets       */
-       u64     txf_timeout;    /*  Tx timeouts              */
+       u64     txf_timeout;      /*  Tx timeouts                    */
        u64     txf_parity_errors; /*  Transmit parity err           */
-       u64     txf_fid_parity_errors; /*  Transmit FID parity err  */
+       u64     txf_fid_parity_errors; /*  Transmit FID parity err   */
        u64     rxf_ucast_octets; /*  Rx FCoE unicast octets         */
        u64     rxf_ucast;      /*  Rx FCoE unicast frames           */
-       u64     rxf_ucast_vlan; /*  Rx FCoE unicast vlan frames     */
+       u64     rxf_ucast_vlan; /*  Rx FCoE unicast vlan frames      */
        u64     rxf_mcast_octets; /*  Rx FCoE multicast octets       */
        u64     rxf_mcast;      /*  Rx FCoE multicast frames         */
-       u64     rxf_mcast_vlan; /*  Rx FCoE multicast vlan frames   */
+       u64     rxf_mcast_vlan; /*  Rx FCoE multicast vlan frames    */
        u64     rxf_bcast_octets; /*  Rx FCoE broadcast octets       */
        u64     rxf_bcast;      /*  Rx FCoE broadcast frames         */
-       u64     rxf_bcast_vlan; /*  Rx FCoE broadcast vlan frames   */
+       u64     rxf_bcast_vlan; /*  Rx FCoE broadcast vlan frames    */
 };
 
 /*
@@ -852,12 +853,12 @@ struct bfa_port_cfg_s {
        u8       tx_bbcredit;   /*  transmit buffer credits     */
        u8       ratelimit;     /*  ratelimit enabled or not    */
        u8       trl_def_speed; /*  ratelimit default speed     */
-       u8      bb_scn;         /*  BB_SCN value from FLOGI Exchg */
-       u8      bb_scn_state;   /*  Config state of BB_SCN */
-       u8      faa_state;      /*  FAA enabled/disabled        */
-       u8      rsvd[1];
-       u16 path_tov;   /*  device path timeout */
-       u16 q_depth;    /*  SCSI Queue depth            */
+       u8       bb_scn;        /*  BB_SCN value from FLOGI Exchg */
+       u8       bb_scn_state;  /*  Config state of BB_SCN */
+       u8       faa_state;     /*  FAA enabled/disabled        */
+       u8       rsvd[1];
+       u16      path_tov;      /*  device path timeout */
+       u16      q_depth;       /*  SCSI Queue depth            */
 };
 #pragma pack()
 
@@ -868,20 +869,21 @@ struct bfa_port_attr_s {
        /*
         * Static fields
         */
-       wwn_t      nwwn;                /*  node wwn */
-       wwn_t      pwwn;                /*  port wwn */
-       wwn_t      factorynwwn; /*  factory node wwn */
-       wwn_t      factorypwwn; /*  factory port wwn */
-       enum fc_cos     cos_supported;  /*  supported class of services */
-       u32     rsvd;
+       wwn_t                   nwwn;           /*  node wwn */
+       wwn_t                   pwwn;           /*  port wwn */
+       wwn_t                   factorynwwn;    /*  factory node wwn */
+       wwn_t                   factorypwwn;    /*  factory port wwn */
+       enum fc_cos             cos_supported;  /*  supported class of
+                                                *  services */
+       u32                     rsvd;
        struct fc_symname_s     port_symname;   /*  port symbolic name */
-       enum bfa_port_speed speed_supported; /*  supported speeds */
-       bfa_boolean_t   pbind_enabled;
+       enum bfa_port_speed     speed_supported; /* supported speeds */
+       bfa_boolean_t           pbind_enabled;
 
        /*
         * Configured values
         */
-       struct bfa_port_cfg_s pport_cfg;        /*  pport cfg */
+       struct bfa_port_cfg_s   pport_cfg;      /*  pport cfg */
 
        /*
         * Dynamic field - info from BFA
@@ -890,19 +892,20 @@ struct bfa_port_attr_s {
        enum bfa_port_speed     speed;          /*  current speed */
        enum bfa_port_topology  topology;       /*  current topology */
        bfa_boolean_t           beacon;         /*  current beacon status */
-       bfa_boolean_t           link_e2e_beacon; /*  link beacon is on */
-       bfa_boolean_t   bbsc_op_status; /* fc credit recovery oper state */
+       bfa_boolean_t           link_e2e_beacon; /* link beacon is on */
+       bfa_boolean_t           bbsc_op_status; /* fc credit recovery oper
+                                                * state */
 
        /*
         * Dynamic field - info from FCS
         */
-       u32             pid;            /*  port ID */
+       u32                     pid;            /*  port ID */
        enum bfa_port_type      port_type;      /*  current topology */
-       u32             loopback;       /*  external loopback */
-       u32             authfail;       /*  auth fail state */
+       u32                     loopback;       /*  external loopback */
+       u32                     authfail;       /*  auth fail state */
 
        /* FCoE specific  */
-       u16             fcoe_vlan;
+       u16                     fcoe_vlan;
        u8                      rsvd1[2];
 };
 
@@ -910,48 +913,48 @@ struct bfa_port_attr_s {
  *           Port FCP mappings.
  */
 struct bfa_port_fcpmap_s {
-       char            osdevname[256];
+       char    osdevname[256];
        u32     bus;
        u32     target;
        u32     oslun;
        u32     fcid;
-       wwn_t      nwwn;
-       wwn_t      pwwn;
+       wwn_t   nwwn;
+       wwn_t   pwwn;
        u64     fcplun;
-       char            luid[256];
+       char    luid[256];
 };
 
 /*
  *           Port RNID info.
  */
 struct bfa_port_rnid_s {
-       wwn_t        wwn;
+       wwn_t     wwn;
        u32       unittype;
        u32       portid;
        u32       attached_nodes_num;
        u16       ip_version;
        u16       udp_port;
-       u8         ipaddr[16];
+       u8        ipaddr[16];
        u16       rsvd;
        u16       topologydiscoveryflags;
 };
 
 #pragma pack(1)
 struct bfa_fcport_fcf_s {
-       wwn_t      name;           /*  FCF name          */
-       wwn_t      fabric_name;    /*  Fabric Name            */
-       u8              fipenabled;     /*  FIP enabled or not */
-       u8              fipfailed;      /*  FIP failed or not   */
-       u8              resv[2];
-       u8       pri;       /*  FCF priority         */
-       u8       version;       /*  FIP version used     */
-       u8       available;      /*  Available  for  login    */
-       u8       fka_disabled;   /*  FKA is disabled      */
-       u8       maxsz_verified; /*  FCoE max size verified   */
-       u8       fc_map[3];      /*  FC map                */
-       __be16   vlan;     /*  FCoE vlan tag/priority   */
-       u32     fka_adv_per;    /*  FIP  ka advert. period   */
-       mac_t      mac;     /*  FCF mac           */
+       wwn_t   name;           /*  FCF name               */
+       wwn_t   fabric_name;    /*  Fabric Name            */
+       u8      fipenabled;     /*  FIP enabled or not     */
+       u8      fipfailed;      /*  FIP failed or not      */
+       u8      resv[2];
+       u8      pri;            /*  FCF priority           */
+       u8      version;        /*  FIP version used       */
+       u8      available;      /*  Available for login    */
+       u8      fka_disabled;   /*  FKA is disabled        */
+       u8      maxsz_verified; /*  FCoE max size verified */
+       u8      fc_map[3];      /*  FC map                 */
+       __be16  vlan;           /*  FCoE vlan tag/priority */
+       u32     fka_adv_per;    /*  FIP  ka advert. period */
+       mac_t   mac;            /*  FCF mac                */
 };
 
 /*
@@ -981,7 +984,7 @@ struct bfa_port_link_s {
        u8       linkstate_rsn; /*  bfa_port_linkstate_rsn_t */
        u8       topology;      /*  P2P/LOOP bfa_port_topology */
        u8       speed;         /*  Link speed (1/2/4/8 G) */
-       u32     linkstate_opt;  /*  Linkstate optional data (debug) */
+       u32      linkstate_opt; /*  Linkstate optional data (debug) */
        u8       trunked;       /*  Trunked or not (1 or 0) */
        u8       resvd[3];
        struct bfa_qos_attr_s  qos_attr;   /* QoS Attributes */
@@ -1035,7 +1038,7 @@ struct bfa_rport_hal_stats_s {
        u32        sm_fwc_del;      /*  fw create: delete events   */
        u32        sm_fwc_off;      /*  fw create: offline events  */
        u32        sm_fwc_hwf;      /*  fw create: IOC down        */
-       u32        sm_fwc_unexp;            /*  fw create: exception events*/
+       u32        sm_fwc_unexp;    /*  fw create: exception events*/
        u32        sm_on_off;       /*  online: offline events     */
        u32        sm_on_del;       /*  online: delete events      */
        u32        sm_on_hwf;       /*  online: IOC down events    */
@@ -1043,25 +1046,25 @@ struct bfa_rport_hal_stats_s {
        u32        sm_fwd_rsp;      /*  fw delete: fw responses    */
        u32        sm_fwd_del;      /*  fw delete: delete events   */
        u32        sm_fwd_hwf;      /*  fw delete: IOC down events */
-       u32        sm_fwd_unexp;            /*  fw delete: exception events*/
+       u32        sm_fwd_unexp;    /*  fw delete: exception events*/
        u32        sm_off_del;      /*  offline: delete events     */
        u32        sm_off_on;       /*  offline: online events     */
        u32        sm_off_hwf;      /*  offline: IOC down events   */
-       u32        sm_off_unexp;            /*  offline: exception events  */
-       u32        sm_del_fwrsp;            /*  delete: fw responses       */
+       u32        sm_off_unexp;    /*  offline: exception events  */
+       u32        sm_del_fwrsp;    /*  delete: fw responses       */
        u32        sm_del_hwf;      /*  delete: IOC down events    */
-       u32        sm_del_unexp;            /*  delete: exception events   */
-       u32        sm_delp_fwrsp;           /*  delete pend: fw responses  */
+       u32        sm_del_unexp;    /*  delete: exception events   */
+       u32        sm_delp_fwrsp;   /*  delete pend: fw responses  */
        u32        sm_delp_hwf;     /*  delete pend: IOC downs     */
-       u32        sm_delp_unexp;           /*  delete pend: exceptions    */
-       u32        sm_offp_fwrsp;           /*  off-pending: fw responses  */
+       u32        sm_delp_unexp;   /*  delete pend: exceptions    */
+       u32        sm_offp_fwrsp;   /*  off-pending: fw responses  */
        u32        sm_offp_del;     /*  off-pending: deletes       */
        u32        sm_offp_hwf;     /*  off-pending: IOC downs     */
-       u32        sm_offp_unexp;           /*  off-pending: exceptions    */
+       u32        sm_offp_unexp;   /*  off-pending: exceptions    */
        u32        sm_iocd_off;     /*  IOC down: offline events   */
        u32        sm_iocd_del;     /*  IOC down: delete events    */
        u32        sm_iocd_on;      /*  IOC down: online events    */
-       u32        sm_iocd_unexp;           /*  IOC down: exceptions       */
+       u32        sm_iocd_unexp;   /*  IOC down: exceptions       */
        u32        rsvd;
 };
 #pragma pack(1)
@@ -1069,9 +1072,9 @@ struct bfa_rport_hal_stats_s {
  *  Rport's QoS attributes
  */
 struct bfa_rport_qos_attr_s {
-       u8                      qos_priority;  /*  rport's QoS priority   */
-       u8                      rsvd[3];
-       u32            qos_flow_id;       /*  QoS flow Id        */
+       u8              qos_priority;   /*  rport's QoS priority   */
+       u8              rsvd[3];
+       u32             qos_flow_id;    /*  QoS flow Id  */
 };
 #pragma pack()
 
index dee1a094c2c2a6af5a80871785afea81a60e5833..53b60d85a319e6a116260eeb4cc609d72b2165f6 100644 (file)
@@ -557,8 +557,7 @@ bfad_debugfs_exit(struct bfad_port_s *port)
                }
        }
 
-       /*
-        * Remove the pci_dev debugfs directory for the port */
+       /* Remove the pci_dev debugfs directory for the port */
        if (port->port_debugfs_root) {
                debugfs_remove(port->port_debugfs_root);
                port->port_debugfs_root = NULL;