aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2010-07-19 14:45:51 -0400
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 12:52:11 -0400
commitff5f58f06deb3f7b9a865093d7f580bbc2b9b498 (patch)
tree69e68e8b25fae3eb641c96752959565746eba1b7 /drivers/block
parentbfd63ee571ed2a1ab7af99544e326483f84c0544 (diff)
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')
-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 e1c2bf1c6d64..10502a200226 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)
3711 * the io functions. 3711 * the io functions.
3712 * This is for debug only. 3712 * This is for debug only.
3713 */ 3713 */
3714#ifdef CCISS_DEBUG
3715static void print_cfg_table(CfgTable_struct *tb) 3714static void print_cfg_table(CfgTable_struct *tb)
3716{ 3715{
3716#ifdef CCISS_DEBUG
3717 int i; 3717 int i;
3718 char temp_name[17]; 3718 char temp_name[17];
3719 3719
@@ -3742,8 +3742,8 @@ static void print_cfg_table(CfgTable_struct *tb)
3742 temp_name[16] = '\0'; 3742 temp_name[16] = '\0';
3743 printk(" Server Name = %s\n", temp_name); 3743 printk(" Server Name = %s\n", temp_name);
3744 printk(" Heartbeat Counter = 0x%x\n\n\n", readl(&(tb->HeartBeat))); 3744 printk(" Heartbeat Counter = 0x%x\n\n\n", readl(&(tb->HeartBeat)));
3745}
3746#endif /* CCISS_DEBUG */ 3745#endif /* CCISS_DEBUG */
3746}
3747 3747
3748static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr) 3748static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr)
3749{ 3749{
@@ -3833,6 +3833,7 @@ cciss_put_controller_into_performant_mode(ctlr_info_t *h)
3833 3833
3834 BUILD_BUG_ON(28 > MAXSGENTRIES + 4); 3834 BUILD_BUG_ON(28 > MAXSGENTRIES + 4);
3835 3835
3836 dev_dbg(&h->pdev->dev, "Trying to put board into Performant mode\n");
3836 /* Attempt to put controller into performant mode if supported */ 3837 /* Attempt to put controller into performant mode if supported */
3837 /* Does board support performant mode? */ 3838 /* Does board support performant mode? */
3838 trans_support = readl(&(h->cfgtable->TransportSupport)); 3839 trans_support = readl(&(h->cfgtable->TransportSupport));
@@ -4190,9 +4191,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c)
4190 err = cciss_find_cfgtables(c); 4191 err = cciss_find_cfgtables(c);
4191 if (err) 4192 if (err)
4192 goto err_out_free_res; 4193 goto err_out_free_res;
4193#ifdef CCISS_DEBUG
4194 print_cfg_table(c->cfgtable); 4194 print_cfg_table(c->cfgtable);
4195#endif /* CCISS_DEBUG */
4196 cciss_find_board_params(c); 4195 cciss_find_board_params(c);
4197 4196
4198 if (!CISS_signature_present(c)) { 4197 if (!CISS_signature_present(c)) {
@@ -4201,9 +4200,6 @@ static int __devinit cciss_pci_init(ctlr_info_t *c)
4201 } 4200 }
4202 cciss_enable_scsi_prefetch(c); 4201 cciss_enable_scsi_prefetch(c);
4203 cciss_p600_dma_prefetch_quirk(c); 4202 cciss_p600_dma_prefetch_quirk(c);
4204#ifdef CCISS_DEBUG
4205 printk(KERN_WARNING "Trying to put board into Performant mode\n");
4206#endif /* CCISS_DEBUG */
4207 cciss_put_controller_into_performant_mode(c); 4203 cciss_put_controller_into_performant_mode(c);
4208 return 0; 4204 return 0;
4209 4205