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 <[EMAIL PROTECTED]>
---
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
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
