>
> As a side note, I wonder it it wouldn't be worth defining a dedicated
> macro for this one DRM_INFO() call, as you seem to be willing to have
> the very same format for all drivers.
You should really look at DRM CVS, where this code is cut down
considerably and is going to be pushed into the kernel... I'm going to try
and get those patches lined up soon for Linus,... the new code results
in only one pci_pretty_name call,
Dave.
>
> Thanks.
>
> * * * * *
>
> Drop pci_pretty_name calls from DRM drivers as the PCI names
> database has gone.
>
> Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
> ---
>
> drivers/char/drm/drmP.h | 4 ----
> drivers/char/drm/i810_drv.c | 4 ++--
> drivers/char/drm/i830_drv.c | 4 ++--
> drivers/char/drm/i915_drv.c | 4 ++--
> drivers/char/drm/mga_drv.c | 4 ++--
> drivers/char/drm/r128_drv.c | 4 ++--
> drivers/char/drm/radeon_drv.c | 4 ++--
> drivers/char/drm/savage_drv.c | 4 ++--
> drivers/char/drm/sis_drv.c | 4 ++--
> drivers/char/drm/tdfx_drv.c | 4 ++--
> drivers/char/drm/via_drv.c | 4 ++--
> 11 files changed, 20 insertions(+), 24 deletions(-)
>
> --- linux-2.6.14-git.orig/drivers/char/drm/drmP.h 2005-11-02
> 19:34:00.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/drmP.h 2005-11-02 19:40:03.000000000
> +0100
> @@ -1077,9 +1077,5 @@
> extern unsigned long drm_core_get_map_ofs(drm_map_t * map);
> extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
>
> -#ifndef pci_pretty_name
> -#define pci_pretty_name(dev) ""
> -#endif
> -
> #endif /* __KERNEL__ */
> #endif
> --- linux-2.6.14-git.orig/drivers/char/drm/i810_drv.c 2005-11-02
> 19:34:01.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/i810_drv.c 2005-11-02
> 19:41:40.000000000 +0100
> @@ -47,12 +47,12 @@
> dev->types[8] = _DRM_STAT_SECONDARY;
> dev->types[9] = _DRM_STAT_DMA;
>
> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
> + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
> DRIVER_NAME,
> DRIVER_MAJOR,
> DRIVER_MINOR,
> DRIVER_PATCHLEVEL,
> - DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
> + DRIVER_DATE, dev->primary.minor
> );
> return 0;
> }
> --- linux-2.6.14-git.orig/drivers/char/drm/i830_drv.c 2005-11-02
> 19:34:01.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/i830_drv.c 2005-11-02
> 19:40:56.000000000 +0100
> @@ -48,12 +48,12 @@
> dev->types[8] = _DRM_STAT_SECONDARY;
> dev->types[9] = _DRM_STAT_DMA;
>
> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
> + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
> DRIVER_NAME,
> DRIVER_MAJOR,
> DRIVER_MINOR,
> DRIVER_PATCHLEVEL,
> - DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
> + DRIVER_DATE, dev->primary.minor
> );
> return 0;
> }
> --- linux-2.6.14-git.orig/drivers/char/drm/i915_drv.c 2005-11-02
> 19:34:01.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/i915_drv.c 2005-11-02
> 19:40:38.000000000 +0100
> @@ -42,12 +42,12 @@
> dev->types[8] = _DRM_STAT_SECONDARY;
> dev->types[9] = _DRM_STAT_DMA;
>
> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
> + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
> DRIVER_NAME,
> DRIVER_MAJOR,
> DRIVER_MINOR,
> DRIVER_PATCHLEVEL,
> - DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
> + DRIVER_DATE, dev->primary.minor
> );
> return 0;
> }
> --- linux-2.6.14-git.orig/drivers/char/drm/mga_drv.c 2005-11-02
> 19:34:01.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/mga_drv.c 2005-11-02
> 19:40:26.000000000 +0100
> @@ -51,12 +51,12 @@
> dev->types[7] = _DRM_STAT_PRIMARY;
> dev->types[8] = _DRM_STAT_SECONDARY;
>
> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
> + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
> DRIVER_NAME,
> DRIVER_MAJOR,
> DRIVER_MINOR,
> DRIVER_PATCHLEVEL,
> - DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
> + DRIVER_DATE, dev->primary.minor
> );
> return 0;
> }
> --- linux-2.6.14-git.orig/drivers/char/drm/r128_drv.c 2005-11-02
> 19:34:02.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/r128_drv.c 2005-11-02
> 19:41:05.000000000 +0100
> @@ -39,12 +39,12 @@
>
> static int postinit(struct drm_device *dev, unsigned long flags)
> {
> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
> + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
> DRIVER_NAME,
> DRIVER_MAJOR,
> DRIVER_MINOR,
> DRIVER_PATCHLEVEL,
> - DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
> + DRIVER_DATE, dev->primary.minor
> );
> return 0;
> }
> --- linux-2.6.14-git.orig/drivers/char/drm/radeon_drv.c 2005-11-02
> 19:34:02.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/radeon_drv.c 2005-11-02
> 19:39:55.000000000 +0100
> @@ -44,12 +44,12 @@
>
> static int postinit(struct drm_device *dev, unsigned long flags)
> {
> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
> + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
> DRIVER_NAME,
> DRIVER_MAJOR,
> DRIVER_MINOR,
> DRIVER_PATCHLEVEL,
> - DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
> + DRIVER_DATE, dev->primary.minor
> );
> return 0;
> }
> --- linux-2.6.14-git.orig/drivers/char/drm/savage_drv.c 2005-11-02
> 19:34:02.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/savage_drv.c 2005-11-02
> 19:39:27.000000000 +0100
> @@ -32,12 +32,12 @@
>
> static int postinit(struct drm_device *dev, unsigned long flags)
> {
> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
> + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
> DRIVER_NAME,
> DRIVER_MAJOR,
> DRIVER_MINOR,
> DRIVER_PATCHLEVEL,
> - DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
> + DRIVER_DATE, dev->primary.minor
> );
> return 0;
> }
> --- linux-2.6.14-git.orig/drivers/char/drm/sis_drv.c 2005-11-02
> 19:34:02.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/sis_drv.c 2005-11-02
> 19:41:13.000000000 +0100
> @@ -34,12 +34,12 @@
>
> static int postinit(struct drm_device *dev, unsigned long flags)
> {
> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
> + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
> DRIVER_NAME,
> DRIVER_MAJOR,
> DRIVER_MINOR,
> DRIVER_PATCHLEVEL,
> - DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
> + DRIVER_DATE, dev->primary.minor
> );
> return 0;
> }
> --- linux-2.6.14-git.orig/drivers/char/drm/tdfx_drv.c 2005-11-02
> 19:34:02.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/tdfx_drv.c 2005-11-02
> 19:40:15.000000000 +0100
> @@ -38,12 +38,12 @@
>
> static int postinit(struct drm_device *dev, unsigned long flags)
> {
> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
> + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
> DRIVER_NAME,
> DRIVER_MAJOR,
> DRIVER_MINOR,
> DRIVER_PATCHLEVEL,
> - DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
> + DRIVER_DATE, dev->primary.minor
> );
> return 0;
> }
> --- linux-2.6.14-git.orig/drivers/char/drm/via_drv.c 2005-11-02
> 19:34:02.000000000 +0100
> +++ linux-2.6.14-git/drivers/char/drm/via_drv.c 2005-11-02
> 19:39:44.000000000 +0100
> @@ -31,12 +31,12 @@
>
> static int postinit(struct drm_device *dev, unsigned long flags)
> {
> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
> + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
> DRIVER_NAME,
> DRIVER_MAJOR,
> DRIVER_MINOR,
> DRIVER_PATCHLEVEL,
> - DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
> + DRIVER_DATE, dev->primary.minor
> );
> return 0;
> }
>
>
>
--
David Airlie, Software Engineer
http://www.skynet.ie/~airlied / airlied at skynet.ie
Linux kernel - DRI, VAX / pam_smb / ILUG
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
