Home » Mailing list archives » linux-kernel » 2008 » July » 2

[patch 02/04] PCI: handle pci_name() being const

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Greg Kroah-Hartman
Subject: [patch 02/04] PCI: handle pci_name() being const
Date: Wednesday, July 2, 2008 - 1:24 pm

This changes pci_setup_device to handle pci_name() now returning a
constant string.

Cc: Jesse Barns <jbarnes@virtuousgeek.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/pci/probe.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -711,8 +711,9 @@ static int pci_setup_device(struct pci_d
 {
 	u32 class;
 
-	sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
-		dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+	dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
+		     dev->bus->number, PCI_SLOT(dev->devfn),
+		     PCI_FUNC(dev->devfn));
 
 	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
 	dev->revision = class & 0xff;

-- 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] PCI: make pci_name use dev_name, Greg Kroah-Hartman, (Wed Jul 2, 8:35 am)
Re: [PATCH] PCI: make pci_name use dev_name, Greg Kroah-Hartman, (Wed Jul 2, 8:51 am)
Re: [PATCH] PCI: make pci_name use dev_name, Jesse Barnes, (Wed Jul 2, 8:58 am)
Re: [PATCH] PCI: make pci_name use dev_name, Greg KH, (Wed Jul 2, 9:04 am)
Re: [PATCH] PCI: make pci_name use dev_name, Greg KH, (Wed Jul 2, 1:22 pm)
[patch 01/04] MTD: handle pci_name() being const, Greg Kroah-Hartman, (Wed Jul 2, 1:24 pm)
[patch 02/04] PCI: handle pci_name() being const, Greg Kroah-Hartman, (Wed Jul 2, 1:24 pm)
[patch 03/04] 3c59x: handle pci_name() being const, Greg Kroah-Hartman, (Wed Jul 2, 1:24 pm)
[patch 04/04] USB: handle pci_name() being const, Greg Kroah-Hartman, (Wed Jul 2, 1:24 pm)
Re: [patch 03/04] 3c59x: handle pci_name() being const, Andrew Morton, (Wed Jul 2, 4:28 pm)
Re: [patch 03/04] 3c59x: handle pci_name() being const, Steffen Klassert, (Thu Jul 3, 5:17 am)
Re: [patch 03/04] 3c59x: handle pci_name() being const, Greg KH, (Thu Jul 3, 8:43 am)
Re: [patch 02/04] PCI: handle pci_name() being const, Jesse Barnes, (Thu Jul 3, 12:33 pm)
Re: [PATCH] PCI: make pci_name use dev_name, Jesse Barnes, (Thu Jul 3, 12:37 pm)
Re: [PATCH] PCI: make pci_name use dev_name, Greg KH, (Thu Jul 3, 1:24 pm)
Re: [PATCH] PCI: make pci_name use dev_name, Jesse Barnes, (Thu Jul 3, 1:33 pm)
Re: [PATCH] PCI: make pci_name use dev_name, Greg KH, (Thu Jul 3, 1:52 pm)
Re: [patch 03/04] 3c59x: handle pci_name() being const, Jeff Garzik, (Wed Aug 6, 11:31 pm)
Re: [patch 03/04] 3c59x: handle pci_name() being const, Steffen Klassert, (Thu Aug 7, 3:18 am)