drivers/net/chelsio: Use pr_<level>, netif_msg_<type>

[safe/jmp/linux-2.6] / drivers / net / chelsio / cxgb2.c

diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index a54a32b..0f71304 100644 (file)
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -974,7 +974,7 @@ void t1_fatal_err(struct adapter *adapter)
                t1_sge_stop(adapter->sge);
                t1_interrupts_disable(adapter);
        }
-       CH_ALERT("%s: encountered fatal error, operation suspended\n",
+       pr_alert("%s: encountered fatal error, operation suspended\n",
                 adapter->name);
 }
 
@@ -1018,7 +1018,7 @@ static int __devinit init_one(struct pci_dev *pdev,
                return err;
 
        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-               CH_ERR("%s: cannot find PCI device memory base address\n",
+               pr_err("%s: cannot find PCI device memory base address\n",
                       pci_name(pdev));
                err = -ENODEV;
                goto out_disable_pdev;
@@ -1028,20 +1028,20 @@ static int __devinit init_one(struct pci_dev *pdev,
                pci_using_dac = 1;
 
                if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
-                       CH_ERR("%s: unable to obtain 64-bit DMA for "
+                       pr_err("%s: unable to obtain 64-bit DMA for "
                               "consistent allocations\n", pci_name(pdev));
                        err = -ENODEV;
                        goto out_disable_pdev;
                }
 
        } else if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {
-               CH_ERR("%s: no usable DMA configuration\n", pci_name(pdev));
+               pr_err("%s: no usable DMA configuration\n", pci_name(pdev));
                goto out_disable_pdev;
        }
 
        err = pci_request_regions(pdev, DRV_NAME);
        if (err) {
-               CH_ERR("%s: cannot obtain PCI resources\n", pci_name(pdev));
+               pr_err("%s: cannot obtain PCI resources\n", pci_name(pdev));
                goto out_disable_pdev;
        }
 
@@ -1069,7 +1069,7 @@ static int __devinit init_one(struct pci_dev *pdev,
 
                        adapter->regs = ioremap(mmio_start, mmio_len);
                        if (!adapter->regs) {
-                               CH_ERR("%s: cannot map device registers\n",
+                               pr_err("%s: cannot map device registers\n",
                                       pci_name(pdev));
                                err = -ENOMEM;
                                goto out_free_dev;
@@ -1148,8 +1148,8 @@ static int __devinit init_one(struct pci_dev *pdev,
        for (i = 0; i < bi->port_number; ++i) {
                err = register_netdev(adapter->port[i].dev);
                if (err)
-                       CH_WARN("%s: cannot register net device %s, skipping\n",
-                               pci_name(pdev), adapter->port[i].dev->name);
+                       pr_warning("%s: cannot register net device %s, skipping\n",
+                                  pci_name(pdev), adapter->port[i].dev->name);
                else {
                        /*
                         * Change the name we use for messages to the name of
@@ -1162,7 +1162,7 @@ static int __devinit init_one(struct pci_dev *pdev,
                }
        }
        if (!adapter->registered_device_map) {
-               CH_ERR("%s: could not register any net devices\n",
+               pr_err("%s: could not register any net devices\n",
                       pci_name(pdev));
                goto out_release_adapter_res;
        }