[SCSI] bfa: remove all OS wrappers

Remove OS wrapper functions/macros, and as a result remove bfa_os_inc.h.

Signed-off-by: Maggie Zhang <xmzhang@brocade.com>
Signed-off-by: Jing Huang <huangj@brocade.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 19 insertions, 19 deletions

diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index d10adcbf24b3..7b0f9725bbc9 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -92,10 +92,10 @@ bfa_cb_ioim_done(void *drv, struct bfad_ioim_s *dio,
                 if (!cmnd->result && itnim &&
                          (bfa_lun_queue_depth > cmnd->device->queue_depth)) {
                         /* Queue depth adjustment for good status completion */
-                        bfad_os_ramp_up_qdepth(itnim, cmnd->device);
+                        bfad_ramp_up_qdepth(itnim, cmnd->device);
                 } else if (cmnd->result == SAM_STAT_TASK_SET_FULL && itnim) {
                         /* qfull handling */
-                        bfad_os_handle_qfull(itnim, cmnd->device);
+                        bfad_handle_qfull(itnim, cmnd->device);
                 }
         }
 
@@ -123,7 +123,7 @@ bfa_cb_ioim_good_comp(void *drv, struct bfad_ioim_s *dio)
                 if (itnim_data) {
                         itnim = itnim_data->itnim;
                         if (itnim)
-                                bfad_os_ramp_up_qdepth(itnim, cmnd->device);
+                                bfad_ramp_up_qdepth(itnim, cmnd->device);
                 }
         }
 
@@ -366,7 +366,7 @@ bfad_im_reset_bus_handler(struct scsi_cmnd *cmnd)
 
         spin_lock_irqsave(&bfad->bfad_lock, flags);
         for (i = 0; i < MAX_FCP_TARGET; i++) {
-                itnim = bfad_os_get_itnim(im_port, i);
+                itnim = bfad_get_itnim(im_port, i);
                 if (itnim) {
                         cmnd->SCp.ptr = (char *)&wq;
                         rc = bfad_im_target_reset_send(bfad, cmnd, itnim);
@@ -547,7 +547,7 @@ bfad_im_scsi_host_alloc(struct bfad_s *bfad, struct bfad_im_port_s *im_port,
 
         mutex_unlock(&bfad_mutex);
 
-        im_port->shost = bfad_os_scsi_host_alloc(im_port, bfad);
+        im_port->shost = bfad_scsi_host_alloc(im_port, bfad);
         if (!im_port->shost) {
                 error = 1;
                 goto out_free_idr;
@@ -573,7 +573,7 @@ bfad_im_scsi_host_alloc(struct bfad_s *bfad, struct bfad_im_port_s *im_port,
         }
 
         /* setup host fixed attribute if the lk supports */
-        bfad_os_fc_host_init(im_port);
+        bfad_fc_host_init(im_port);
 
         return 0;
 
@@ -684,7 +684,7 @@ bfad_im_probe(struct bfad_s *bfad)
         bfad->im = im;
         im->bfad = bfad;
 
-        if (bfad_os_thread_workq(bfad) != BFA_STATUS_OK) {
+        if (bfad_thread_workq(bfad) != BFA_STATUS_OK) {
                 kfree(im);
                 rc = BFA_STATUS_FAILED;
         }
@@ -697,14 +697,14 @@ void
 bfad_im_probe_undo(struct bfad_s *bfad)
 {
         if (bfad->im) {
-                bfad_os_destroy_workq(bfad->im);
+                bfad_destroy_workq(bfad->im);
                 kfree(bfad->im);
                 bfad->im = NULL;
         }
 }
 
 struct Scsi_Host *
-bfad_os_scsi_host_alloc(struct bfad_im_port_s *im_port, struct bfad_s *bfad)
+bfad_scsi_host_alloc(struct bfad_im_port_s *im_port, struct bfad_s *bfad)
 {
         struct scsi_host_template *sht;
 
@@ -719,7 +719,7 @@ bfad_os_scsi_host_alloc(struct bfad_im_port_s *im_port, struct bfad_s *bfad)
 }
 
 void
-bfad_os_scsi_host_free(struct bfad_s *bfad, struct bfad_im_port_s *im_port)
+bfad_scsi_host_free(struct bfad_s *bfad, struct bfad_im_port_s *im_port)
 {
         if (!(im_port->flags & BFAD_PORT_DELETE))
                 flush_workqueue(bfad->im->drv_workq);
@@ -729,7 +729,7 @@ bfad_os_scsi_host_free(struct bfad_s *bfad, struct bfad_im_port_s *im_port)
 }
 
 void
-bfad_os_destroy_workq(struct bfad_im_s *im)
+bfad_destroy_workq(struct bfad_im_s *im)
 {
         if (im && im->drv_workq) {
                 flush_workqueue(im->drv_workq);
@@ -739,7 +739,7 @@ bfad_os_destroy_workq(struct bfad_im_s *im)
 }
 
 bfa_status_t
-bfad_os_thread_workq(struct bfad_s *bfad)
+bfad_thread_workq(struct bfad_s *bfad)
 {
         struct bfad_im_s      *im = bfad->im;
 
@@ -843,7 +843,7 @@ bfad_im_module_exit(void)
 }
 
 void
-bfad_os_ramp_up_qdepth(struct bfad_itnim_s *itnim, struct scsi_device *sdev)
+bfad_ramp_up_qdepth(struct bfad_itnim_s *itnim, struct scsi_device *sdev)
 {
         struct scsi_device *tmp_sdev;
 
@@ -871,7 +871,7 @@ bfad_os_ramp_up_qdepth(struct bfad_itnim_s *itnim, struct scsi_device *sdev)
 }
 
 void
-bfad_os_handle_qfull(struct bfad_itnim_s *itnim, struct scsi_device *sdev)
+bfad_handle_qfull(struct bfad_itnim_s *itnim, struct scsi_device *sdev)
 {
         struct scsi_device *tmp_sdev;
 
@@ -885,7 +885,7 @@ bfad_os_handle_qfull(struct bfad_itnim_s *itnim, struct scsi_device *sdev)
 }
 
 struct bfad_itnim_s *
-bfad_os_get_itnim(struct bfad_im_port_s *im_port, int id)
+bfad_get_itnim(struct bfad_im_port_s *im_port, int id)
 {
         struct bfad_itnim_s   *itnim = NULL;
 
@@ -946,7 +946,7 @@ bfad_im_supported_speeds(struct bfa_s *bfa)
 }
 
 void
-bfad_os_fc_host_init(struct bfad_im_port_s *im_port)
+bfad_fc_host_init(struct bfad_im_port_s *im_port)
 {
         struct Scsi_Host *host = im_port->shost;
         struct bfad_s         *bfad = im_port->bfad;
@@ -990,7 +990,7 @@ bfad_im_fc_rport_add(struct bfad_im_port_s *im_port, struct bfad_itnim_s *itnim)
         rport_ids.port_name =
                 cpu_to_be64(bfa_fcs_itnim_get_pwwn(&itnim->fcs_itnim));
         rport_ids.port_id =
-                bfa_os_hton3b(bfa_fcs_itnim_get_fcid(&itnim->fcs_itnim));
+                bfa_hton3b(bfa_fcs_itnim_get_fcid(&itnim->fcs_itnim));
         rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;
 
         itnim->fc_rport = fc_rport =
@@ -1192,7 +1192,7 @@ out_fail_cmd:
 static DEF_SCSI_QCMD(bfad_im_queuecommand)
 
 void
-bfad_os_rport_online_wait(struct bfad_s *bfad)
+bfad_rport_online_wait(struct bfad_s *bfad)
 {
         int i;
         int rport_delay = 10;
@@ -1220,7 +1220,7 @@ bfad_os_rport_online_wait(struct bfad_s *bfad)
 }
 
 int
-bfad_os_get_linkup_delay(struct bfad_s *bfad)
+bfad_get_linkup_delay(struct bfad_s *bfad)
 {
         u8              nwwns = 0;
         wwn_t           wwns[BFA_PREBOOT_BOOTLUN_MAX];