diff options
author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-10-07 22:35:31 +0000 |
---|---|---|
committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-10-07 22:35:31 +0000 |
commit | 10b0136796e88448cbc61786aa9afe1ba3743684 (patch) | |
tree | b4a28a309237e61954bec72ef9af954c584f2189 /sys/dev/pci/drm/sis_drv.c | |
parent | de77aa96dbda64a24a3a51da5d7bd5da3597a63e (diff) |
Kill a bunch of #ifdef freebsd/netbsd code in *_drv.c. No binary change.
Diffstat (limited to 'sys/dev/pci/drm/sis_drv.c')
-rw-r--r-- | sys/dev/pci/drm/sis_drv.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/sys/dev/pci/drm/sis_drv.c b/sys/dev/pci/drm/sis_drv.c index 14c3d505ddf..a77125a01cf 100644 --- a/sys/dev/pci/drm/sis_drv.c +++ b/sys/dev/pci/drm/sis_drv.c @@ -66,57 +66,11 @@ static const struct drm_driver_info sis_driver = { .use_mtrr = 1, }; -#ifdef __FreeBSD__ -static int -sis_probe(device_t dev) -{ - return drm_probe(dev, sis_pciidlist); -} - -static int -sis_attach(device_t nbdev) -{ - struct drm_device *dev = device_get_softc(nbdev); - - bzero(dev, sizeof(struct drm_device)); - sis_configure(dev); - return drm_attach(nbdev, sis_pciidlist); -} - -static device_method_t sis_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, sis_probe), - DEVMETHOD(device_attach, sis_attach), - DEVMETHOD(device_detach, drm_detach), - - { 0, 0 } -}; - -static driver_t sis_driver = { - "drm", - sis_methods, - sizeof(struct drm_device) -}; - -extern devclass_t drm_devclass; -#if __FreeBSD_version >= 700010 -DRIVER_MODULE(sisdrm, vgapci, sis_driver, drm_devclass, 0, 0); -#else -DRIVER_MODULE(sisdrm, pci, sis_driver, drm_devclass, 0, 0); -#endif -MODULE_DEPEND(sisdrm, drm, 1, 1, 1); - -#elif defined(__NetBSD__) || defined(__OpenBSD__) - int sisdrm_probe(struct device *, void *, void *); void sisdrm_attach(struct device *, struct device *, void *); int -#if defined(__OpenBSD__) sisdrm_probe(struct device *parent, void *match, void *aux) -#else -sisdrm_probe(struct device *parent, struct cfdata *match, void *aux) -#endif { return drm_probe((struct pci_attach_args *)aux, sis_pciidlist); } @@ -131,7 +85,6 @@ sisdrm_attach(struct device *parent, struct device *self, void *aux) return drm_attach(parent, self, pa, sis_pciidlist); } -#if defined(__OpenBSD__) struct cfattach sisdrm_ca = { sizeof(struct drm_device), sisdrm_probe, sisdrm_attach, drm_detach, drm_activate @@ -140,13 +93,3 @@ struct cfattach sisdrm_ca = { struct cfdriver sisdrm_cd = { 0, "sisdrm", DV_DULL }; -#else -#ifdef _LKM -CFDRIVER_DECL(sisdrm, DV_TTY, NULL); -#else -CFATTACH_DECL(sisdrm, sizeof(struct drm_device), sisdrm_probe, sisdrm_attach, - drm_detach, drm_activate); -#endif -#endif - -#endif |