[PATCH] PCI: remove CONFIG_PCI_NAMES

This patch removes CONFIG_PCI_NAMES.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 3241d6c9dc11..ffbcd40418d5 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -937,12 +937,12 @@ static int __devinit mthca_init_one(struct pci_dev *pdev,
                 ++mthca_version_printed;
         }
 
-        printk(KERN_INFO PFX "Initializing %s (%s)\n",
-               pci_pretty_name(pdev), pci_name(pdev));
+        printk(KERN_INFO PFX "Initializing %s\n",
+               pci_name(pdev));
 
         if (id->driver_data >= ARRAY_SIZE(mthca_hca_table)) {
-                printk(KERN_ERR PFX "%s (%s) has invalid driver data %lx\n",
-                       pci_pretty_name(pdev), pci_name(pdev), id->driver_data);
+                printk(KERN_ERR PFX "%s has invalid driver data %lx\n",
+                       pci_name(pdev), id->driver_data);
                 return -ENODEV;
         }
 
diff --git a/drivers/infiniband/hw/mthca/mthca_reset.c b/drivers/infiniband/hw/mthca/mthca_reset.c
index 8ea801271a41..4f995391dd1d 100644
--- a/drivers/infiniband/hw/mthca/mthca_reset.c
+++ b/drivers/infiniband/hw/mthca/mthca_reset.c
@@ -71,8 +71,8 @@ int mthca_reset(struct mthca_dev *mdev)
                                                 bridge)) != NULL) {
                         if (bridge->hdr_type    == PCI_HEADER_TYPE_BRIDGE &&
                             bridge->subordinate == mdev->pdev->bus) {
-                                mthca_dbg(mdev, "Found bridge: %s (%s)\n",
-                                          pci_pretty_name(bridge), pci_name(bridge));
+                                mthca_dbg(mdev, "Found bridge: %s\n",
+                                          pci_name(bridge));
                                 break;
                         }
                 }
@@ -83,8 +83,8 @@ int mthca_reset(struct mthca_dev *mdev)
                          * assume we're in no-bridge mode and hope for
                          * the best.
                          */
-                        mthca_warn(mdev, "No bridge found for %s (%s)\n",
-                                  pci_pretty_name(mdev->pdev), pci_name(mdev->pdev));
+                        mthca_warn(mdev, "No bridge found for %s\n",
+                                  pci_name(mdev->pdev));
                 }
 
         }