lkml.org 
[lkml]   [2008]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] PCI: make pci_name use dev_name
On Wed, Jul 02, 2008 at 08:35:24AM -0700, Greg Kroah-Hartman wrote:
> From: Greg Kroah-Hartman <gregkh@suse.de>
>
> Also fixes up the sparc PCI code that was assuming this is not a
> constant.
>
> This is done in anticipation of removing the bus_id field from struct
> driver.
>
> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
>
> ---
> arch/sparc64/kernel/pci.c | 2 +-
> include/linux/pci.h | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> --- a/arch/sparc64/kernel/pci.c
> +++ b/arch/sparc64/kernel/pci.c
> @@ -408,7 +408,7 @@ struct pci_dev *of_create_pci_dev(struct
> dev->class = class >> 8;
> dev->revision = class & 0xff;
>
> - sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
> + sprintf(dev->dev.bus_id, "%04x:%02x:%02x.%d", pci_domain_nr(bus),
> dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
>
> if (ofpci_verbose)
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -977,9 +977,9 @@ static inline void pci_set_drvdata(struc
> /* If you want to know what to call your pci_dev, ask this function.
> * Again, it's a wrapper around the generic device.
> */
> -static inline char *pci_name(struct pci_dev *pdev)
> +static inline const char *pci_name(struct pci_dev *pdev)

Andrew just pointed out to me that this causes a bunch of compiler
warnings to be generated. I'll go audit the tree to fix them as well
and send you a follow-on patch if that's ok.

thanks,

greg k-h


\
 
 \ /
  Last update: 2008-07-02 17:59    [W:2.064 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site