pm8001: clean bitmap management functions

In the driver two different functions are used to free the same resource,
this patch makes the code easier to read. In addittion to that, some
minor optimisations were made too.

Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Acked-by: Suresh Thiagarajan <Suresh.Thiagarajan@pmcs.com>
Acked-by: Jack Wang <xjtuwjp@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

3 files changed, 12 insertions, 30 deletions

diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index a97be015e52e..92943797d862 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -3100,7 +3100,7 @@ void pm8001_mpi_set_dev_state_resp(struct pm8001_hba_info *pm8001_ha,
         complete(pm8001_dev->setds_completion);
         ccb->task = NULL;
         ccb->ccb_tag = 0xFFFFFFFF;
-        pm8001_ccb_free(pm8001_ha, tag);
+        pm8001_tag_free(pm8001_ha, tag);
 }
 
 void pm8001_mpi_set_nvmd_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
@@ -3119,7 +3119,7 @@ void pm8001_mpi_set_nvmd_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
         }
         ccb->task = NULL;
         ccb->ccb_tag = 0xFFFFFFFF;
-        pm8001_ccb_free(pm8001_ha, tag);
+        pm8001_tag_free(pm8001_ha, tag);
 }
 
 void
@@ -3181,7 +3181,7 @@ pm8001_mpi_get_nvmd_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
         complete(pm8001_ha->nvmd_completion);
         ccb->task = NULL;
         ccb->ccb_tag = 0xFFFFFFFF;
-        pm8001_ccb_free(pm8001_ha, tag);
+        pm8001_tag_free(pm8001_ha, tag);
 }
 
 int pm8001_mpi_local_phy_ctl(struct pm8001_hba_info *pm8001_ha, void *piomb)
@@ -3588,7 +3588,7 @@ int pm8001_mpi_reg_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
         complete(pm8001_dev->dcompletion);
         ccb->task = NULL;
         ccb->ccb_tag = 0xFFFFFFFF;
-        pm8001_ccb_free(pm8001_ha, htag);
+        pm8001_tag_free(pm8001_ha, htag);
         return 0;
 }
 
@@ -3672,7 +3672,7 @@ int pm8001_mpi_fw_flash_update_resp(struct pm8001_hba_info *pm8001_ha,
         complete(pm8001_ha->nvmd_completion);
         ccb->task = NULL;
         ccb->ccb_tag = 0xFFFFFFFF;
-        pm8001_ccb_free(pm8001_ha, tag);
+        pm8001_tag_free(pm8001_ha, tag);
         return 0;
 }
 
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index 8a44bc92bc78..be55859042cd 100644
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -58,25 +58,14 @@ static int pm8001_find_tag(struct sas_task *task, u32 *tag)
 }
 
 /**
-  * pm8001_tag_clear - clear the tags bitmap
+  * pm8001_tag_free - free the no more needed tag
   * @pm8001_ha: our hba struct
   * @tag: the found tag associated with the task
   */
-static void pm8001_tag_clear(struct pm8001_hba_info *pm8001_ha, u32 tag)
-{
-        void *bitmap = pm8001_ha->tags;
-        clear_bit(tag, bitmap);
-}
-
 void pm8001_tag_free(struct pm8001_hba_info *pm8001_ha, u32 tag)
 {
-        pm8001_tag_clear(pm8001_ha, tag);
-}
-
-static void pm8001_tag_set(struct pm8001_hba_info *pm8001_ha, u32 tag)
-{
         void *bitmap = pm8001_ha->tags;
-        set_bit(tag, bitmap);
+        clear_bit(tag, bitmap);
 }
 
 /**
@@ -86,14 +75,13 @@ static void pm8001_tag_set(struct pm8001_hba_info *pm8001_ha, u32 tag)
   */
 inline int pm8001_tag_alloc(struct pm8001_hba_info *pm8001_ha, u32 *tag_out)
 {
-        unsigned int index, tag;
+        unsigned int tag;
         void *bitmap = pm8001_ha->tags;
 
-        index = find_first_zero_bit(bitmap, pm8001_ha->tags_num);
-        tag = index;
+        tag = find_first_zero_bit(bitmap, pm8001_ha->tags_num);
         if (tag >= pm8001_ha->tags_num)
                 return -SAS_QUEUE_FULL;
-        pm8001_tag_set(pm8001_ha, tag);
+        set_bit(tag, bitmap);
         *tag_out = tag;
         return 0;
 }
@@ -102,7 +90,7 @@ void pm8001_tag_init(struct pm8001_hba_info *pm8001_ha)
 {
         int i;
         for (i = 0; i < pm8001_ha->tags_num; ++i)
-                pm8001_tag_clear(pm8001_ha, i);
+                pm8001_tag_free(pm8001_ha, i);
 }
 
  /**
@@ -501,11 +489,6 @@ int pm8001_queue_command(struct sas_task *task, const int num,
         return pm8001_task_exec(task, num, gfp_flags, 0, NULL);
 }
 
-void pm8001_ccb_free(struct pm8001_hba_info *pm8001_ha, u32 ccb_idx)
-{
-        pm8001_tag_clear(pm8001_ha, ccb_idx);
-}
-
 /**
   * pm8001_ccb_task_free - free the sg for ssp and smp command, free the ccb.
   * @pm8001_ha: our hba card information
@@ -542,7 +525,7 @@ void pm8001_ccb_task_free(struct pm8001_hba_info *pm8001_ha,
         ccb->task = NULL;
         ccb->ccb_tag = 0xFFFFFFFF;
         ccb->open_retry = 0;
-        pm8001_ccb_free(pm8001_ha, ccb_idx);
+        pm8001_tag_free(pm8001_ha, ccb_idx);
 }
 
  /**
diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
index 1ee06f21803b..14106adec009 100644
--- a/drivers/scsi/pm8001/pm8001_sas.h
+++ b/drivers/scsi/pm8001/pm8001_sas.h
@@ -616,7 +616,6 @@ extern struct workqueue_struct *pm8001_wq;
 int pm8001_tag_alloc(struct pm8001_hba_info *pm8001_ha, u32 *tag_out);
 void pm8001_tag_init(struct pm8001_hba_info *pm8001_ha);
 u32 pm8001_get_ncq_tag(struct sas_task *task, u32 *tag);
-void pm8001_ccb_free(struct pm8001_hba_info *pm8001_ha, u32 ccb_idx);
 void pm8001_ccb_task_free(struct pm8001_hba_info *pm8001_ha,
         struct sas_task *task, struct pm8001_ccb_info *ccb, u32 ccb_idx);
 int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,