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 <[EMAIL PROTECTED]>
---
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
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel
