forked from Minki/linux
[PATCH] IB/mthca: Clean up error messages
- Fix incorrect cut-n-paste in error messages. - Add missing newlines in error messages. - Use DRV_NAME instead of "ib_mthca" in a couple of places. Signed-off-by: Roland Dreier <roland@topspin.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
cd4e8fb49d
commit
177214af29
@ -615,8 +615,7 @@ static void mthca_free_eq(struct mthca_dev *dev,
|
||||
if (err)
|
||||
mthca_warn(dev, "HW2SW_EQ failed (%d)\n", err);
|
||||
if (status)
|
||||
mthca_warn(dev, "HW2SW_EQ returned status 0x%02x\n",
|
||||
status);
|
||||
mthca_warn(dev, "HW2SW_EQ returned status 0x%02x\n", status);
|
||||
|
||||
dev->eq_table.arm_mask &= ~eq->eqn_mask;
|
||||
|
||||
@ -709,8 +708,7 @@ static int __devinit mthca_map_eq_regs(struct mthca_dev *dev)
|
||||
if (mthca_map_reg(dev, ((pci_resource_len(dev->pdev, 0) - 1) &
|
||||
dev->fw.arbel.eq_arm_base) + 4, 4,
|
||||
&dev->eq_regs.arbel.eq_arm)) {
|
||||
mthca_err(dev, "Couldn't map interrupt clear register, "
|
||||
"aborting.\n");
|
||||
mthca_err(dev, "Couldn't map EQ arm register, aborting.\n");
|
||||
mthca_unmap_reg(dev, (pci_resource_len(dev->pdev, 0) - 1) &
|
||||
dev->fw.arbel.clr_int_base, MTHCA_CLR_INT_SIZE,
|
||||
dev->clr_base);
|
||||
@ -721,8 +719,7 @@ static int __devinit mthca_map_eq_regs(struct mthca_dev *dev)
|
||||
dev->fw.arbel.eq_set_ci_base,
|
||||
MTHCA_EQ_SET_CI_SIZE,
|
||||
&dev->eq_regs.arbel.eq_set_ci_base)) {
|
||||
mthca_err(dev, "Couldn't map interrupt clear register, "
|
||||
"aborting.\n");
|
||||
mthca_err(dev, "Couldn't map EQ CI register, aborting.\n");
|
||||
mthca_unmap_reg(dev, ((pci_resource_len(dev->pdev, 0) - 1) &
|
||||
dev->fw.arbel.eq_arm_base) + 4, 4,
|
||||
dev->eq_regs.arbel.eq_arm);
|
||||
|
@ -70,7 +70,7 @@ MODULE_PARM_DESC(msi, "attempt to use MSI if nonzero");
|
||||
#endif /* CONFIG_PCI_MSI */
|
||||
|
||||
static const char mthca_version[] __devinitdata =
|
||||
"ib_mthca: Mellanox InfiniBand HCA driver v"
|
||||
DRV_NAME ": Mellanox InfiniBand HCA driver v"
|
||||
DRV_VERSION " (" DRV_RELDATE ")\n";
|
||||
|
||||
static struct mthca_profile default_profile = {
|
||||
@ -928,13 +928,13 @@ static int __devinit mthca_init_one(struct pci_dev *pdev,
|
||||
*/
|
||||
if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM) ||
|
||||
pci_resource_len(pdev, 0) != 1 << 20) {
|
||||
dev_err(&pdev->dev, "Missing DCS, aborting.");
|
||||
dev_err(&pdev->dev, "Missing DCS, aborting.\n");
|
||||
err = -ENODEV;
|
||||
goto err_disable_pdev;
|
||||
}
|
||||
if (!(pci_resource_flags(pdev, 2) & IORESOURCE_MEM) ||
|
||||
pci_resource_len(pdev, 2) != 1 << 23) {
|
||||
dev_err(&pdev->dev, "Missing UAR, aborting.");
|
||||
dev_err(&pdev->dev, "Missing UAR, aborting.\n");
|
||||
err = -ENODEV;
|
||||
goto err_disable_pdev;
|
||||
}
|
||||
@ -1164,7 +1164,7 @@ static struct pci_device_id mthca_pci_table[] = {
|
||||
MODULE_DEVICE_TABLE(pci, mthca_pci_table);
|
||||
|
||||
static struct pci_driver mthca_driver = {
|
||||
.name = "ib_mthca",
|
||||
.name = DRV_NAME,
|
||||
.id_table = mthca_pci_table,
|
||||
.probe = mthca_init_one,
|
||||
.remove = __devexit_p(mthca_remove_one)
|
||||
|
Loading…
Reference in New Issue
Block a user