Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:57:04 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/pci [riastradh-drm2]: drm_pci.c
Log Message:
Move driver->bus setting to drm_pci_init.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/external/bsd/drm2/pci/drm_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.1.2.5 src/sys/external/bsd/drm2/pci/drm_pci.c:1.1.2.6
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.1.2.5 Wed Jul 24 03:54:14 2013
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Wed Jul 24 03:57:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.1.2.5 2013/07/24 03:54:14 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.1.2.6 2013/07/24 03:57:03 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.1.2.5 2013/07/24 03:54:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.1.2.6 2013/07/24 03:57:03 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -73,13 +73,25 @@ drm_pci_attach_args(struct drm_device *d
return &dev->pdev->pd_pa;
}
+int
+drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver __unused)
+{
+
+ driver->bus = &drm_pci_bus;
+ return 0;
+}
+
+void
+drm_pci_exit(struct drm_driver *driver __unused,
+ struct pci_driver *pdriver __unused)
+{
+}
+
void
drm_pci_attach(device_t self, const struct pci_attach_args *pa,
struct pci_dev *pdev, struct drm_device *dev)
{
- dev->driver->bus = &drm_pci_bus;
-
linux_pci_dev_init(pdev, self, pa, 0);
dev->pdev = pdev;
