Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d37ffbe4 authored by Robert Elliott's avatar Robert Elliott Committed by James Bottomley
Browse files

hpsa: make function names consistent 



make function names more consistent and meaningful

Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@Suse.de>
Signed-off-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent e985c58f

drivers/scsi/hpsa.c

+8 −6
Original line number Diff line number Diff line
@@ -6766,7 +6766,7 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev, u32 board_id) 
	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) *
@@ -7302,7 +7302,7 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	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))
@@ -7749,7 +7749,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));
@@ -7788,7 +7789,8 @@ static int hpsa_alloc_ioaccel_cmd_and_bft(struct ctlr_info *h) 
	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 */
@@ -7843,13 +7845,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;

		}

	}