diff options
| author |   Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-07-19 13:46:43 -0500 |
|---|---|---|
| committer |   Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 18:52:30 +0200 |
| commit | 6b4d96b878d67c6768766e682c188a2a8bdc804a (patch) | |
| tree | c879de9d10eb2b28e0d3f7382057206035a51734 /drivers/block/cciss_scsi.c | |
| parent | cciss: use consistent variable names (diff) | |
| download | linux-dev-6b4d96b878d67c6768766e682c188a2a8bdc804a.tar.xz linux-dev-6b4d96b878d67c6768766e682c188a2a8bdc804a.zip | |
cciss: separate cmd_alloc() and cmd_special_alloc()
cciss: separate cmd_alloc() and cmd_special_alloc()
cmd_alloc() took a parameter which caused it to either allocate
from a pre-allocated pool, or allocate using pci_alloc_consistent.
This parameter is always known at compile time, so this would
be better handled by breaking the function into two functions
and differentiating the cases by function names. Same goes
for cmd_free().
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/cciss_scsi.c')
| -rw-r--r-- | drivers/block/cciss_scsi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index 9133ad4c7b1b..9fe0d8ffc90d 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c @@ -49,8 +49,10 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff, __u8 page_code, unsigned char *scsi3addr, int cmd_type); -static CommandList_struct *cmd_alloc(ctlr_info_t *h, int get_from_pool); -static void cmd_free(ctlr_info_t *h, CommandList_struct *c, int got_from_pool); +static CommandList_struct *cmd_alloc(ctlr_info_t *h); +static CommandList_struct *cmd_special_alloc(ctlr_info_t *h); +static void cmd_free(ctlr_info_t *h, CommandList_struct *c); +static void cmd_special_free(ctlr_info_t *h, CommandList_struct *c); static int cciss_scsi_proc_info( struct Scsi_Host *sh, @@ -1582,7 +1584,7 @@ static int wait_for_device_to_become_ready(ctlr_info_t *h, int waittime = HZ; CommandList_struct *c; - c = cmd_alloc(h, 1); + c = cmd_alloc(h); if (!c) { printk(KERN_WARNING "cciss%d: out of memory in " "wait_for_device_to_become_ready.\n", h->ctlr); @@ -1640,7 +1642,7 @@ retry_tur: else printk(KERN_WARNING "cciss%d: device is ready.\n", h->ctlr); - cmd_free(h, c, 1); + cmd_free(h, c); return rc; } |