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.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 732ae3dc0449..8075c54bac03 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3705,14 +3705,6 @@ static int __devinit hpsa_lookup_board_id(struct pci_dev *pdev, u32 *board_id)
3705 return ARRAY_SIZE(products) - 1; /* generic unknown smart array */ 3705 return ARRAY_SIZE(products) - 1; /* generic unknown smart array */
3706} 3706}
3707 3707
3708static inline bool hpsa_board_disabled(struct pci_dev *pdev)
3709{
3710 u16 command;
3711
3712 (void) pci_read_config_word(pdev, PCI_COMMAND, &command);
3713 return ((command & PCI_COMMAND_MEMORY) == 0);
3714}
3715
3716static int __devinit hpsa_pci_find_memory_BAR(struct pci_dev *pdev, 3708static int __devinit hpsa_pci_find_memory_BAR(struct pci_dev *pdev,
3717 unsigned long *memory_bar) 3709 unsigned long *memory_bar)
3718{ 3710{
@@ -3929,11 +3921,6 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
3929 h->product_name = products[prod_index].product_name; 3921 h->product_name = products[prod_index].product_name;
3930 h->access = *(products[prod_index].access); 3922 h->access = *(products[prod_index].access);
3931 3923
3932 if (hpsa_board_disabled(h->pdev)) {
3933 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
3934 return -ENODEV;
3935 }
3936
3937 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S | 3924 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
3938 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM); 3925 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
3939 3926