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

[Jesse Barnes]

On Wednesday, July 02, 2008 1:24 pm Greg Kroah-Hartman wrote:
> This changes pci_setup_device to handle pci_name() now returning a
> constant string.
>
> Cc: Jesse Barns <jbarnes@xxxxxxxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
>
> ---
>  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;

Just applied this to my linux-next branch (fortunately I already had the 
dev_set_name commit).  Doing a quick build & test before I push it out.

Thanks,
Jesse
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/