aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/hpsa.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/hpsa.c')
-rw-r--r--drivers/scsi/hpsa.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 57d038045adc..7e602d282d52 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3135,9 +3135,9 @@ static __devinit int hpsa_hard_reset_controller(struct pci_dev *pdev)
3135 * the io functions. 3135 * the io functions.
3136 * This is for debug only. 3136 * This is for debug only.
3137 */ 3137 */
3138#ifdef HPSA_DEBUG
3139static void print_cfg_table(struct device *dev, struct CfgTable *tb) 3138static void print_cfg_table(struct device *dev, struct CfgTable *tb)
3140{ 3139{
3140#ifdef HPSA_DEBUG
3141 int i; 3141 int i;
3142 char temp_name[17]; 3142 char temp_name[17];
3143 3143
@@ -3167,8 +3167,8 @@ static void print_cfg_table(struct device *dev, struct CfgTable *tb)
3167 dev_info(dev, " Server Name = %s\n", temp_name); 3167 dev_info(dev, " Server Name = %s\n", temp_name);
3168 dev_info(dev, " Heartbeat Counter = 0x%x\n\n\n", 3168 dev_info(dev, " Heartbeat Counter = 0x%x\n\n\n",
3169 readl(&(tb->HeartBeat))); 3169 readl(&(tb->HeartBeat)));
3170}
3171#endif /* HPSA_DEBUG */ 3170#endif /* HPSA_DEBUG */
3171}
3172 3172
3173static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr) 3173static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr)
3174{ 3174{
@@ -3434,11 +3434,7 @@ static int __devinit hpsa_enter_simple_mode(struct ctlr_info *h)
3434 /* delay and try again */ 3434 /* delay and try again */
3435 msleep(10); 3435 msleep(10);
3436 } 3436 }
3437
3438#ifdef HPSA_DEBUG
3439 print_cfg_table(&h->pdev->dev, h->cfgtable); 3437 print_cfg_table(&h->pdev->dev, h->cfgtable);
3440#endif /* HPSA_DEBUG */
3441
3442 if (!(readl(&(h->cfgtable->TransportActive)) & CFGTBL_Trans_Simple)) { 3438 if (!(readl(&(h->cfgtable->TransportActive)) & CFGTBL_Trans_Simple)) {
3443 dev_warn(&h->pdev->dev, 3439 dev_warn(&h->pdev->dev,
3444 "unable to get board into simple mode\n"); 3440 "unable to get board into simple mode\n");