[v4,08/43] hpsa: make function names consistent

Commit Message

Don Brace April 16, 2015, 1:47 p.m. UTC

From: Robert Elliott <[e-mail]>

make function names more consistent and meaningful

Reviewed-by: Scott Teel <[e-mail]>
Reviewed-by: Kevin Barnett <[e-mail]>
Signed-off-by: Robert Elliott <[e-mail]>
Signed-off-by: Don Brace <[e-mail]>
---
 drivers/scsi/hpsa.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Hannes Reinecke April 17, 2015, 1:04 p.m. UTC | #1

On 04/16/2015 03:47 PM, Don Brace wrote:
> From: Robert Elliott <[e-mail]>
> 
> make function names more consistent and meaningful
> 
> Reviewed-by: Scott Teel <[e-mail]>
> Reviewed-by: Kevin Barnett <[e-mail]>
> Signed-off-by: Robert Elliott <[e-mail]>
> Signed-off-by: Don Brace <[e-mail]>

Reviewed-by: Hannes Reinecke <[e-mail]>

Cheers,

Hannes

Tomas Henzl April 17, 2015, 1:24 p.m. UTC | #2

On 04/16/2015 03:47 PM, Don Brace wrote:
> From: Robert Elliott <[e-mail]>
>
> make function names more consistent and meaningful
>
> Reviewed-by: Scott Teel <[e-mail]>
> Reviewed-by: Kevin Barnett <[e-mail]>
> Signed-off-by: Robert Elliott <[e-mail]>
> Signed-off-by: Don Brace <[e-mail]>

Reviewed-by: Tomas Henzl <[e-mail]>

Tomas

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index adc0ad3..a9a301c 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6790,7 +6790,7 @@  out_disable:
 	return rc;
 }
 
-static int hpsa_allocate_cmd_pool(struct ctlr_info *h)
+static int hpsa_alloc_cmd_pool(struct ctlr_info *h)
 {
 	h->cmd_pool_bits = kzalloc(
 		DIV_ROUND_UP(h->nr_cmds, BITS_PER_LONG) *
@@ -7321,7 +7321,7 @@  reinit_after_soft_reset:
 	dev_info(&pdev->dev, "%s: <0x%x> at IRQ %d%s using DAC\n",
 	       h->devname, pdev->device,
 	       h->intr[h->intr_mode], dac ? "" : " not");
-	rc = hpsa_allocate_cmd_pool(h);
+	rc = hpsa_alloc_cmd_pool(h);
 	if (rc)
 		goto clean2_and_free_irqs;
 	if (hpsa_allocate_sg_chain_blocks(h))
@@ -7768,7 +7768,8 @@  static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
 	return 0;
 }
 
-static int hpsa_alloc_ioaccel_cmd_and_bft(struct ctlr_info *h)
+/* Allocate ioaccel1 mode command blocks and block fetch table */
+static int hpsa_alloc_ioaccel1_cmd_and_bft(struct ctlr_info *h)
 {
 	h->ioaccel_maxsg =
 		readl(&(h->cfgtable->io_accel_max_embedded_sg_count));
@@ -7807,7 +7808,8 @@  clean_up:
 	return 1;
 }
 
-static int ioaccel2_alloc_cmds_and_bft(struct ctlr_info *h)
+/* Allocate ioaccel2 mode command blocks and block fetch table */
+static int hpsa_alloc_ioaccel2_cmd_and_bft(struct ctlr_info *h)
 {
 	/* Allocate ioaccel2 mode command blocks and block fetch table */
 
@@ -7862,13 +7864,13 @@  static void hpsa_put_ctlr_into_performant_mode(struct ctlr_info *h)
 	if (trans_support & CFGTBL_Trans_io_accel1) {
 		transMethod |= CFGTBL_Trans_io_accel1 |
 				CFGTBL_Trans_enable_directed_msix;
-		if (hpsa_alloc_ioaccel_cmd_and_bft(h))
+		if (hpsa_alloc_ioaccel1_cmd_and_bft(h))
 			goto clean_up;
 	} else {
 		if (trans_support & CFGTBL_Trans_io_accel2) {
 				transMethod |= CFGTBL_Trans_io_accel2 |
 				CFGTBL_Trans_enable_directed_msix;
-		if (ioaccel2_alloc_cmds_and_bft(h))
+		if (hpsa_alloc_ioaccel2_cmd_and_bft(h))
 			goto clean_up;
 		}
 	}