From: Jean D. <kh...@li...> - 2005-10-28 19:18:19
|
Hi David, all, Looks like the PCI names database removal was done in a rush on the drm front. I propose the following cleanup. Signed-off-by: Jean Delvare <kh...@li...> --- drivers/char/drm/drmP.h | 4 ---- drivers/char/drm/i810_drv.c | 5 ++--- drivers/char/drm/i830_drv.c | 5 ++--- drivers/char/drm/i915_drv.c | 5 ++--- drivers/char/drm/mga_drv.c | 5 ++--- drivers/char/drm/r128_drv.c | 5 ++--- drivers/char/drm/radeon_drv.c | 5 ++--- drivers/char/drm/savage_drv.c | 5 ++--- drivers/char/drm/sis_drv.c | 5 ++--- drivers/char/drm/tdfx_drv.c | 5 ++--- drivers/char/drm/via_drv.c | 4 ++-- 11 files changed, 20 insertions(+), 33 deletions(-) --- linux-2.6.14.orig/drivers/char/drm/drmP.h 2005-10-28 18:25:27.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/drmP.h 2005-10-28 19:40:15.000000000 +0200 @@ -1071,9 +1071,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.orig/drivers/char/drm/i810_drv.c 2005-10-28 18:25:27.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/i810_drv.c 2005-10-28 19:42:00.000000000 +0200 @@ -47,14 +47,13 @@ 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) + dev->primary.minor ); return 0; } --- linux-2.6.14.orig/drivers/char/drm/i830_drv.c 2005-10-28 18:25:27.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/i830_drv.c 2005-10-28 19:42:02.000000000 +0200 @@ -48,14 +48,13 @@ 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) + dev->primary.minor ); return 0; } --- linux-2.6.14.orig/drivers/char/drm/i915_drv.c 2005-10-28 18:25:27.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/i915_drv.c 2005-10-28 19:42:07.000000000 +0200 @@ -42,14 +42,13 @@ 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) + dev->primary.minor ); return 0; } --- linux-2.6.14.orig/drivers/char/drm/mga_drv.c 2005-10-28 18:25:27.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/mga_drv.c 2005-10-28 19:42:11.000000000 +0200 @@ -52,14 +52,13 @@ 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) + dev->primary.minor ); return 0; } --- linux-2.6.14.orig/drivers/char/drm/r128_drv.c 2005-10-28 18:23:52.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/r128_drv.c 2005-10-28 19:42:15.000000000 +0200 @@ -39,14 +39,13 @@ 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) + dev->primary.minor ); return 0; } --- linux-2.6.14.orig/drivers/char/drm/radeon_drv.c 2005-10-28 18:25:27.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/radeon_drv.c 2005-10-28 19:42:18.000000000 +0200 @@ -40,14 +40,13 @@ 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) + dev->primary.minor ); return 0; } --- linux-2.6.14.orig/drivers/char/drm/savage_drv.c 2005-10-28 18:25:27.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/savage_drv.c 2005-10-28 19:42:21.000000000 +0200 @@ -32,14 +32,13 @@ 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) + dev->primary.minor ); return 0; } --- linux-2.6.14.orig/drivers/char/drm/sis_drv.c 2005-10-28 18:22:43.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/sis_drv.c 2005-10-28 19:42:24.000000000 +0200 @@ -34,14 +34,13 @@ 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) + dev->primary.minor ); return 0; } --- linux-2.6.14.orig/drivers/char/drm/tdfx_drv.c 2005-10-28 18:22:43.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/tdfx_drv.c 2005-10-28 19:40:49.000000000 +0200 @@ -38,14 +38,13 @@ 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) + dev->primary.minor ); return 0; } --- linux-2.6.14.orig/drivers/char/drm/via_drv.c 2005-10-28 18:23:52.000000000 +0200 +++ linux-2.6.14/drivers/char/drm/via_drv.c 2005-10-28 19:40:26.000000000 +0200 @@ -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; } -- Jean Delvare |
From: Dave A. <ai...@li...> - 2005-10-29 23:56:51
|
The current CVS has changed the whole way this is called.. I'll be putting that patch into git for 2.6.15 soon.. Dave. On Fri, 28 Oct 2005, Jean Delvare wrote: > Hi David, all, > > Looks like the PCI names database removal was done in a rush on the > drm front. I propose the following cleanup. > > Signed-off-by: Jean Delvare <kh...@li...> > > --- > drivers/char/drm/drmP.h | 4 ---- > drivers/char/drm/i810_drv.c | 5 ++--- > drivers/char/drm/i830_drv.c | 5 ++--- > drivers/char/drm/i915_drv.c | 5 ++--- > drivers/char/drm/mga_drv.c | 5 ++--- > drivers/char/drm/r128_drv.c | 5 ++--- > drivers/char/drm/radeon_drv.c | 5 ++--- > drivers/char/drm/savage_drv.c | 5 ++--- > drivers/char/drm/sis_drv.c | 5 ++--- > drivers/char/drm/tdfx_drv.c | 5 ++--- > drivers/char/drm/via_drv.c | 4 ++-- > 11 files changed, 20 insertions(+), 33 deletions(-) > > --- linux-2.6.14.orig/drivers/char/drm/drmP.h 2005-10-28 18:25:27.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/drmP.h 2005-10-28 19:40:15.000000000 +0200 > @@ -1071,9 +1071,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.orig/drivers/char/drm/i810_drv.c 2005-10-28 18:25:27.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/i810_drv.c 2005-10-28 19:42:00.000000000 +0200 > @@ -47,14 +47,13 @@ > 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) > + dev->primary.minor > ); > return 0; > } > --- linux-2.6.14.orig/drivers/char/drm/i830_drv.c 2005-10-28 18:25:27.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/i830_drv.c 2005-10-28 19:42:02.000000000 +0200 > @@ -48,14 +48,13 @@ > 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) > + dev->primary.minor > ); > return 0; > } > --- linux-2.6.14.orig/drivers/char/drm/i915_drv.c 2005-10-28 18:25:27.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/i915_drv.c 2005-10-28 19:42:07.000000000 +0200 > @@ -42,14 +42,13 @@ > 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) > + dev->primary.minor > ); > return 0; > } > --- linux-2.6.14.orig/drivers/char/drm/mga_drv.c 2005-10-28 18:25:27.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/mga_drv.c 2005-10-28 19:42:11.000000000 +0200 > @@ -52,14 +52,13 @@ > 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) > + dev->primary.minor > ); > return 0; > } > --- linux-2.6.14.orig/drivers/char/drm/r128_drv.c 2005-10-28 18:23:52.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/r128_drv.c 2005-10-28 19:42:15.000000000 +0200 > @@ -39,14 +39,13 @@ > > 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) > + dev->primary.minor > ); > return 0; > } > --- linux-2.6.14.orig/drivers/char/drm/radeon_drv.c 2005-10-28 18:25:27.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/radeon_drv.c 2005-10-28 19:42:18.000000000 +0200 > @@ -40,14 +40,13 @@ > > 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) > + dev->primary.minor > ); > return 0; > } > --- linux-2.6.14.orig/drivers/char/drm/savage_drv.c 2005-10-28 18:25:27.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/savage_drv.c 2005-10-28 19:42:21.000000000 +0200 > @@ -32,14 +32,13 @@ > > 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) > + dev->primary.minor > ); > return 0; > } > --- linux-2.6.14.orig/drivers/char/drm/sis_drv.c 2005-10-28 18:22:43.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/sis_drv.c 2005-10-28 19:42:24.000000000 +0200 > @@ -34,14 +34,13 @@ > > 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) > + dev->primary.minor > ); > return 0; > } > --- linux-2.6.14.orig/drivers/char/drm/tdfx_drv.c 2005-10-28 18:22:43.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/tdfx_drv.c 2005-10-28 19:40:49.000000000 +0200 > @@ -38,14 +38,13 @@ > > 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) > + dev->primary.minor > ); > return 0; > } > --- linux-2.6.14.orig/drivers/char/drm/via_drv.c 2005-10-28 18:23:52.000000000 +0200 > +++ linux-2.6.14/drivers/char/drm/via_drv.c 2005-10-28 19:40:26.000000000 +0200 > @@ -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 |
From: Jean D. <kh...@li...> - 2005-11-02 19:43:45
|
Hi Dave, > The current CVS has changed the whole way this is called.. I'll be putting > that patch into git for 2.6.15 soon.. I had to update this patch due to whitespace changes (some of which are quite questionable) in Linus' git tree today. Not sure is these are the changes you were referring to right above, or something different. Here is the updated version. 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. Thanks. * * * * * Drop pci_pretty_name calls from DRM drivers as the PCI names database has gone. Signed-off-by: Jean Delvare <kh...@li...> --- 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; } -- Jean Delvare |
From: Dave A. <ai...@li...> - 2005-11-02 22:05:19
|
> > 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 <kh...@li...> > --- > > 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 |
From: Jean D. <kh...@li...> - 2005-11-03 20:34:49
|
Hi Dave, > 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, OK, I've grabbed drm CVS and here is my patch against it. I assumed that linux-core was the directory where the development was happening. Thanks. * * * * * Drop pci_pretty_name calls from DRM drivers as the PCI names database has gone. Signed-off-by: Jean Delvare <kh...@li...> --- linux-core/drm_compat.h | 8 -------- linux-core/drm_stub.c | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff -ru drm.orig/linux-core/drm_compat.h drm/linux-core/drm_compat.h --- drm.orig/linux-core/drm_compat.h 2005-09-25 07:19:06.000000000 +0200 +++ drm/linux-core/drm_compat.h 2005-11-03 20:53:11.000000000 +0100 @@ -150,10 +150,6 @@ return NULL; } -#ifndef pci_pretty_name -#define pci_pretty_name(x) x->name -#endif - struct drm_device; static inline int radeon_create_i2c_busses(struct drm_device *dev) { @@ -196,10 +192,6 @@ #define __x86_64__ #endif -#ifndef pci_pretty_name -#define pci_pretty_name(dev) "" -#endif - /* sysfs __ATTR macro */ #ifndef __ATTR #define __ATTR(_name,_mode,_show,_store) { \ diff -ru drm.orig/linux-core/drm_stub.c drm/linux-core/drm_stub.c --- drm.orig/linux-core/drm_stub.c 2005-08-05 05:50:23.000000000 +0200 +++ drm/linux-core/drm_stub.c 2005-11-03 20:52:46.000000000 +0100 @@ -222,9 +222,9 @@ if ((ret = drm_get_head(dev, &dev->primary))) goto err_g1; - 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; -- Jean Delvare |