summaryrefslogtreecommitdiff
path: root/bsd-core/i915_drv.c
diff options
context:
space:
mode:
authorvehemens <vehemens@verizon.net>2009-03-08 18:17:15 -0700
committerRobert Noland <rnoland@2hip.net>2009-03-08 22:18:43 -0500
commit2221e16703bf5bf813a98926b968bd5b28eb5d70 (patch)
treee3ceae93efbfb3d77b534ca88d636c833d6c4ff7 /bsd-core/i915_drv.c
parent391c92ae1799f0d1fddb2321c5713afc58575514 (diff)
FreeBSD use kdev for kernel device name
Signed-off-by: Robert Noland <rnoland@2hip.net>
Diffstat (limited to 'bsd-core/i915_drv.c')
-rw-r--r--bsd-core/i915_drv.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/bsd-core/i915_drv.c b/bsd-core/i915_drv.c
index a323ac3c..1f7cfa46 100644
--- a/bsd-core/i915_drv.c
+++ b/bsd-core/i915_drv.c
@@ -40,9 +40,9 @@ static drm_pci_id_list_t i915_pciidlist[] = {
i915_PCI_IDS
};
-static int i915_suspend(device_t nbdev)
+static int i915_suspend(device_t kdev)
{
- struct drm_device *dev = device_get_softc(nbdev);
+ struct drm_device *dev = device_get_softc(kdev);
struct drm_i915_private *dev_priv = dev->dev_private;
if (!dev || !dev_priv) {
@@ -54,16 +54,16 @@ static int i915_suspend(device_t nbdev)
i915_save_state(dev);
- return (bus_generic_suspend(nbdev));
+ return (bus_generic_suspend(kdev));
}
-static int i915_resume(device_t nbdev)
+static int i915_resume(device_t kdev)
{
- struct drm_device *dev = device_get_softc(nbdev);
+ struct drm_device *dev = device_get_softc(kdev);
i915_restore_state(dev);
- return (bus_generic_resume(nbdev));
+ return (bus_generic_resume(kdev));
}
static void i915_configure(struct drm_device *dev)
@@ -97,31 +97,31 @@ static void i915_configure(struct drm_device *dev)
}
static int
-i915_probe(device_t dev)
+i915_probe(device_t kdev)
{
- return drm_probe(dev, i915_pciidlist);
+ return drm_probe(kdev, i915_pciidlist);
}
static int
-i915_attach(device_t nbdev)
+i915_attach(device_t kdev)
{
- struct drm_device *dev = device_get_softc(nbdev);
+ struct drm_device *dev = device_get_softc(kdev);
dev->driver = malloc(sizeof(struct drm_driver_info), DRM_MEM_DRIVER,
M_WAITOK | M_ZERO);
i915_configure(dev);
- return drm_attach(nbdev, i915_pciidlist);
+ return drm_attach(kdev, i915_pciidlist);
}
static int
-i915_detach(device_t nbdev)
+i915_detach(device_t kdev)
{
- struct drm_device *dev = device_get_softc(nbdev);
+ struct drm_device *dev = device_get_softc(kdev);
int ret;
- ret = drm_detach(nbdev);
+ ret = drm_detach(kdev);
free(dev->driver, DRM_MEM_DRIVER);