diff options
| author | Jon Smirl <jonsmirl@yahoo.com> | 2004-10-10 22:54:55 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@yahoo.com> | 2004-10-10 22:54:55 +0000 |
| commit | ad549c5ae62fd75aa2bdb8bf5efc4913c476cb02 (patch) | |
| tree | 8501388508ca7005b8401427448d01dd12a3c0b7 /linux-core/drm_ioctl.c | |
| parent | 3f02a793514a866401119efc74c20512f4732703 (diff) | |
Rename fn_tbl to driver. Core driver now uses pci_driver name which
reflects the personality name.
Diffstat (limited to 'linux-core/drm_ioctl.c')
| -rw-r--r-- | linux-core/drm_ioctl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux-core/drm_ioctl.c b/linux-core/drm_ioctl.c index f255b953..831cdf7b 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->name) + strlen(dev->unique) + 2, + dev->devname = drm_alloc(strlen(dev->pdev->driver->name) + strlen(dev->unique) + 2, DRM_MEM_DRIVER); if (!dev->devname) return -ENOMEM; - sprintf(dev->devname, "%s@%s", dev->name, dev->unique); + sprintf(dev->devname, "%s@%s", dev->pdev->driver->name, dev->unique); /* Return error if the busid submitted doesn't match the device's actual * busid. @@ -146,12 +146,12 @@ static int drm_set_busid(drm_device_t * dev) snprintf(dev->unique, dev->unique_len, "pci:%04x:%02x:%02x.%d", dev->pci_domain, dev->pci_bus, dev->pci_slot, dev->pci_func); - dev->devname = drm_alloc(strlen(dev->name) + dev->unique_len + 2, + dev->devname = drm_alloc(strlen(dev->pdev->driver->name) + dev->unique_len + 2, DRM_MEM_DRIVER); if (dev->devname == NULL) return ENOMEM; - sprintf(dev->devname, "%s@%s", dev->name, dev->unique); + sprintf(dev->devname, "%s@%s", dev->pdev->driver->name, dev->unique); return 0; } @@ -350,8 +350,8 @@ int drm_setversion(DRM_IOCTL_ARGS) sv.drm_dd_minor < 0 || sv.drm_dd_minor > DRIVER_MINOR) return EINVAL; - if (dev->fn_tbl->set_version) - dev->fn_tbl->set_version(dev, &sv); + if (dev->driver->set_version) + dev->driver->set_version(dev, &sv); } return 0; } |