diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-11-22 20:49:37 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-11-22 20:49:37 +0000 |
| commit | e352ee055ffd21c59021f5da76de929ac5cd366e (patch) | |
| tree | ebdf8fd97a71e024222c722d3aa3e147b8c34d11 /sys/dev/pci/drm/drmP.h | |
| parent | 1f7fa548404d88d6545729694cab86cd18ee7fec (diff) | |
Remove the driver->load callback and just do all the initialization in
the attach function. First step towards splitting drm off as it's own
(bus independant) device, as it should be.
Diffstat (limited to 'sys/dev/pci/drm/drmP.h')
| -rw-r--r-- | sys/dev/pci/drm/drmP.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h index f4fad5ca95f..54c5da04555 100644 --- a/sys/dev/pci/drm/drmP.h +++ b/sys/dev/pci/drm/drmP.h @@ -442,7 +442,6 @@ struct drm_ati_pcigart_info { }; struct drm_driver_info { - int (*load)(struct drm_device *, unsigned long); int (*firstopen)(struct drm_device *); int (*open)(struct drm_device *, struct drm_file *); int (*ioctl)(struct drm_device*, u_long, caddr_t, @@ -450,7 +449,6 @@ struct drm_driver_info { void (*preclose)(struct drm_device *, struct drm_file *); void (*postclose)(struct drm_device *, struct drm_file *); void (*lastclose)(struct drm_device *); - int (*unload)(struct drm_device *); void (*reclaim_buffers_locked)(struct drm_device *, struct drm_file *); int (*dma_ioctl)(struct drm_device *, void *, struct drm_file *); @@ -581,8 +579,7 @@ extern int drm_debug_flag; /* Device setup support (drm_drv.c) */ int drm_probe(struct pci_attach_args *, drm_pci_id_list_t * ); -void drm_attach(struct device *, struct device *, - struct pci_attach_args *, drm_pci_id_list_t *); +void drm_attach(struct device *, struct device *, struct pci_attach_args *); int drm_detach(struct device *, int ); int drm_activate(struct device *, enum devact); dev_type_ioctl(drmioctl); @@ -593,6 +590,8 @@ dev_type_poll(drmpoll); dev_type_mmap(drmmmap); extern drm_local_map_t *drm_getsarea(struct drm_device *); +drm_pci_id_list_t *drm_find_description(int , int , drm_pci_id_list_t *); + /* File operations helpers (drm_fops.c) */ struct drm_file *drm_find_file_by_minor(struct drm_device *, int); |