提交 050f7147 编写于 作者: S Stephen Cameron 提交者: James Bottomley

hpsa: trivial message and comment clean ups

Cleanup comments to be more specific. Make messages more
informational.
Reviewed-by: NScott Teel <scott.teel@pmcs.com>
Signed-off-by: NRobert Elliott <elliott@hp.com>
Signed-off-by: NDon Brace <don.brace@pmcs.com>
Signed-off-by: NChristoph Hellwig <hch@lst.de>
上级 c7ee65b3
...@@ -5863,8 +5863,8 @@ static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev) ...@@ -5863,8 +5863,8 @@ static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)
} else { } else {
use_doorbell = misc_fw_support & MISC_FW_DOORBELL_RESET; use_doorbell = misc_fw_support & MISC_FW_DOORBELL_RESET;
if (use_doorbell) { if (use_doorbell) {
dev_warn(&pdev->dev, "Soft reset not supported. " dev_warn(&pdev->dev,
"Firmware update is required.\n"); "Soft reset not supported. Firmware update is required.\n");
rc = -ENOTSUPP; /* try soft reset */ rc = -ENOTSUPP; /* try soft reset */
goto unmap_cfgtable; goto unmap_cfgtable;
} }
...@@ -5884,8 +5884,7 @@ static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev) ...@@ -5884,8 +5884,7 @@ static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)
rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_READY); rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_READY);
if (rc) { if (rc) {
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"failed waiting for board to become ready " "Failed waiting for board to become ready after hard reset\n");
"after hard reset\n");
goto unmap_cfgtable; goto unmap_cfgtable;
} }
...@@ -5984,7 +5983,7 @@ static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr) ...@@ -5984,7 +5983,7 @@ static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr)
} }
/* If MSI/MSI-X is supported by the kernel we will try to enable it on /* If MSI/MSI-X is supported by the kernel we will try to enable it on
* controllers that are capable. If not, we use IO-APIC mode. * controllers that are capable. If not, we use legacy INTx mode.
*/ */
static void hpsa_interrupt_mode(struct ctlr_info *h) static void hpsa_interrupt_mode(struct ctlr_info *h)
...@@ -6003,7 +6002,7 @@ static void hpsa_interrupt_mode(struct ctlr_info *h) ...@@ -6003,7 +6002,7 @@ static void hpsa_interrupt_mode(struct ctlr_info *h)
(h->board_id == 0x40820E11) || (h->board_id == 0x40830E11)) (h->board_id == 0x40820E11) || (h->board_id == 0x40830E11))
goto default_int_mode; goto default_int_mode;
if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) { if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) {
dev_info(&h->pdev->dev, "MSIX\n"); dev_info(&h->pdev->dev, "MSI-X capable controller\n");
h->msix_vector = MAX_REPLY_QUEUES; h->msix_vector = MAX_REPLY_QUEUES;
if (h->msix_vector > num_online_cpus()) if (h->msix_vector > num_online_cpus())
h->msix_vector = num_online_cpus(); h->msix_vector = num_online_cpus();
...@@ -6024,7 +6023,7 @@ static void hpsa_interrupt_mode(struct ctlr_info *h) ...@@ -6024,7 +6023,7 @@ static void hpsa_interrupt_mode(struct ctlr_info *h)
} }
single_msi_mode: single_msi_mode:
if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) { if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) {
dev_info(&h->pdev->dev, "MSI\n"); dev_info(&h->pdev->dev, "MSI capable controller\n");
if (!pci_enable_msi(h->pdev)) if (!pci_enable_msi(h->pdev))
h->msi_vector = 1; h->msi_vector = 1;
else else
...@@ -6209,7 +6208,7 @@ static void hpsa_find_board_params(struct ctlr_info *h) ...@@ -6209,7 +6208,7 @@ static void hpsa_find_board_params(struct ctlr_info *h)
static inline bool hpsa_CISS_signature_present(struct ctlr_info *h) static inline bool hpsa_CISS_signature_present(struct ctlr_info *h)
{ {
if (!check_signature(h->cfgtable->Signature, "CISS", 4)) { if (!check_signature(h->cfgtable->Signature, "CISS", 4)) {
dev_warn(&h->pdev->dev, "not a valid CISS config table\n"); dev_err(&h->pdev->dev, "not a valid CISS config table\n");
return false; return false;
} }
return true; return true;
...@@ -6301,7 +6300,7 @@ static int hpsa_enter_simple_mode(struct ctlr_info *h) ...@@ -6301,7 +6300,7 @@ static int hpsa_enter_simple_mode(struct ctlr_info *h)
h->transMethod = CFGTBL_Trans_Simple; h->transMethod = CFGTBL_Trans_Simple;
return 0; return 0;
error: error:
dev_warn(&h->pdev->dev, "unable to get board into simple mode\n"); dev_err(&h->pdev->dev, "failed to enter simple mode\n");
return -ENODEV; return -ENODEV;
} }
...@@ -7282,8 +7281,8 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support) ...@@ -7282,8 +7281,8 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
hpsa_wait_for_mode_change_ack(h); hpsa_wait_for_mode_change_ack(h);
register_value = readl(&(h->cfgtable->TransportActive)); register_value = readl(&(h->cfgtable->TransportActive));
if (!(register_value & CFGTBL_Trans_Performant)) { if (!(register_value & CFGTBL_Trans_Performant)) {
dev_warn(&h->pdev->dev, "unable to get board into" dev_err(&h->pdev->dev,
" performant mode\n"); "performant mode problem - transport not active\n");
return; return;
} }
/* Change the access methods to the performant access methods */ /* Change the access methods to the performant access methods */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册