summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@yahoo.com>2004-10-20 05:11:49 +0000
committerJon Smirl <jonsmirl@yahoo.com>2004-10-20 05:11:49 +0000
commit7ebbebf3d3a3af3c363a1396d737d5a61634124b (patch)
tree9ced0d913d66ea55bd06f9f0a21619875ee494e8 /linux-core
parent5ae6c5af751780fbf424b848aa2355bc303a5b73 (diff)
Switch linux-core from using dev->pdev->driver->name to
dev->driver->pci_driver.name. This avoids the stealth mode case where pdev is pointing to the wrong driver or no driver.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_ioctl.c8
-rw-r--r--linux-core/drm_proc.c4
-rw-r--r--linux-core/drm_stub.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/linux-core/drm_ioctl.c b/linux-core/drm_ioctl.c
index c6d3db67..b90e081d 100644
--- a/linux-core/drm_ioctl.c
+++ b/linux-core/drm_ioctl.c
@@ -109,12 +109,12 @@ int drm_setunique(struct inode *inode, struct file *filp,
dev->unique[dev->unique_len] = '\0';
- dev->devname = drm_alloc(strlen(dev->pdev->driver->name) + strlen(dev->unique) + 2,
+ dev->devname = drm_alloc(strlen(dev->driver->pci_driver.name) + strlen(dev->unique) + 2,
DRM_MEM_DRIVER);
if (!dev->devname)
return -ENOMEM;
- sprintf(dev->devname, "%s@%s", dev->pdev->driver->name, dev->unique);
+ sprintf(dev->devname, "%s@%s", dev->driver->pci_driver.name, dev->unique);
/* Return error if the busid submitted doesn't match the device's actual
* busid.
@@ -149,12 +149,12 @@ static int drm_set_busid(drm_device_t * dev)
if (len > dev->unique_len)
DRM_ERROR("buffer overflow");
- dev->devname = drm_alloc(strlen(dev->pdev->driver->name) + dev->unique_len + 2,
+ dev->devname = drm_alloc(strlen(dev->driver->pci_driver.name) + dev->unique_len + 2,
DRM_MEM_DRIVER);
if (dev->devname == NULL)
return ENOMEM;
- sprintf(dev->devname, "%s@%s", dev->pdev->driver->name, dev->unique);
+ sprintf(dev->devname, "%s@%s", dev->driver->pci_driver.name, dev->unique);
return 0;
}
diff --git a/linux-core/drm_proc.c b/linux-core/drm_proc.c
index bd7b9513..5a92fb30 100644
--- a/linux-core/drm_proc.c
+++ b/linux-core/drm_proc.c
@@ -175,10 +175,10 @@ static int drm_name_info(char *buf, char **start, off_t offset, int request,
if (dev->unique) {
DRM_PROC_PRINT("%s %s %s\n",
- dev->pdev->driver->name, pci_name(dev->pdev),
+ dev->driver->pci_driver.name, pci_name(dev->pdev),
dev->unique);
} else {
- DRM_PROC_PRINT("%s %s\n", dev->pdev->driver->name,
+ DRM_PROC_PRINT("%s %s\n", dev->driver->pci_driver.name,
pci_name(dev->pdev));
}
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index 32ee0cbd..c9277051 100644
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -255,7 +255,7 @@ err_g1:
*/
int drm_put_dev(drm_device_t * dev)
{
- DRM_DEBUG("release primary %s\n", dev->pdev->driver->name);
+ DRM_DEBUG("release primary %s\n", dev->driver->pci_driver.name);
if (dev->unique) {
drm_free(dev->unique, strlen(dev->unique) + 1, DRM_MEM_DRIVER);