summaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2010-07-19 13:45:51 -0500
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 18:52:11 +0200
commitff5f58f06deb3f7b9a865093d7f580bbc2b9b498 (patch)
tree69e68e8b25fae3eb641c96752959565746eba1b7 /drivers/block/cciss.c
parentbfd63ee571ed2a1ab7af99544e326483f84c0544 (diff)
downloadop-kernel-dev-ff5f58f06deb3f7b9a865093d7f580bbc2b9b498.zip
op-kernel-dev-ff5f58f06deb3f7b9a865093d7f580bbc2b9b498.tar.gz
cciss: cleanup some debug ifdefs
cciss: cleanup some debug ifdefs 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.c')
-rw-r--r--drivers/block/cciss.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index e1c2bf1..10502a2 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3711,9 +3711,9 @@ static int check_for_unit_attention(ctlr_info_t *h, CommandList_struct *c)
* the io functions.
* This is for debug only.
*/
-#ifdef CCISS_DEBUG
static void print_cfg_table(CfgTable_struct *tb)
{
+#ifdef CCISS_DEBUG
int i;
char temp_name[17];
@@ -3742,8 +3742,8 @@ static void print_cfg_table(CfgTable_struct *tb)
temp_name[16] = '\0';
printk(" Server Name = %s\n", temp_name);
printk(" Heartbeat Counter = 0x%x\n\n\n", readl(&(tb->HeartBeat)));
-}
#endif /* CCISS_DEBUG */
+}
static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr)
{
@@ -3833,6 +3833,7 @@ cciss_put_controller_into_performant_mode(ctlr_info_t *h)
BUILD_BUG_ON(28 > MAXSGENTRIES + 4);
+ dev_dbg(&h->pdev->dev, "Trying to put board into Performant mode\n");
/* Attempt to put controller into performant mode if supported */
/* Does board support performant mode? */
trans_support = readl(&(h->cfgtable->TransportSupport));
@@ -4190,9 +4191,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c)
err = cciss_find_cfgtables(c);
if (err)
goto err_out_free_res;
-#ifdef CCISS_DEBUG
print_cfg_table(c->cfgtable);
-#endif /* CCISS_DEBUG */
cciss_find_board_params(c);
if (!CISS_signature_present(c)) {
@@ -4201,9 +4200,6 @@ static int __devinit cciss_pci_init(ctlr_info_t *c)
}
cciss_enable_scsi_prefetch(c);
cciss_p600_dma_prefetch_quirk(c);
-#ifdef CCISS_DEBUG
- printk(KERN_WARNING "Trying to put board into Performant mode\n");
-#endif /* CCISS_DEBUG */
cciss_put_controller_into_performant_mode(c);
return 0;
OpenPOWER on IntegriCloud