diff options
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/i915.h | 1 | ||||
| -rw-r--r-- | shared/i915_dma.c | 6 | ||||
| -rw-r--r-- | shared/i915_drv.h | 6 | ||||
| -rw-r--r-- | shared/r128.h | 2 | ||||
| -rw-r--r-- | shared/radeon_state.c | 4 |
5 files changed, 8 insertions, 11 deletions
diff --git a/shared/i915.h b/shared/i915.h index d3ecbb76..ed4e13d7 100644 --- a/shared/i915.h +++ b/shared/i915.h @@ -54,7 +54,6 @@ /* We use our own dma mechanisms, not the drm template code. However, * the shared IRQ code is useful to us: */ - #define __HAVE_PM 1 #endif diff --git a/shared/i915_dma.c b/shared/i915_dma.c index f99a69f4..34552008 100644 --- a/shared/i915_dma.c +++ b/shared/i915_dma.c @@ -733,7 +733,7 @@ int i915_setparam(DRM_IOCTL_ARGS) return 0; } -static void i915_driver_pretakedown(drm_device_t * dev) +static void i915_driver_pretakedown(drm_device_t *dev) { if (dev->dev_private) { drm_i915_private_t *dev_priv = dev->dev_private; @@ -742,7 +742,7 @@ static void i915_driver_pretakedown(drm_device_t * dev) i915_dma_cleanup(dev); } -static void i915_driver_prerelease(drm_device_t * dev, DRMFILE filp) +static void i915_driver_prerelease(drm_device_t *dev, DRMFILE filp) { if (dev->dev_private) { drm_i915_private_t *dev_priv = dev->dev_private; @@ -750,7 +750,7 @@ static void i915_driver_prerelease(drm_device_t * dev, DRMFILE filp) } } -void i915_driver_register_fns(drm_device_t * dev) +void i915_driver_register_fns(drm_device_t *dev) { dev->driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR | diff --git a/shared/i915_drv.h b/shared/i915_drv.h index 828c2371..7564cd09 100644 --- a/shared/i915_drv.h +++ b/shared/i915_drv.h @@ -74,9 +74,9 @@ extern int i915_wait_irq(drm_device_t * dev, int irq_nr); extern int i915_emit_irq(drm_device_t * dev); extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); -extern void i915_driver_irq_preinstall(drm_device_t * dev); -extern void i915_driver_irq_postinstall(drm_device_t * dev); -extern void i915_driver_irq_uninstall(drm_device_t * dev); +extern void i915_driver_irq_preinstall(drm_device_t *dev); +extern void i915_driver_irq_postinstall(drm_device_t *dev); +extern void i915_driver_irq_uninstall(drm_device_t *dev); /* i915_mem.c */ extern int i915_mem_alloc(DRM_IOCTL_ARGS); diff --git a/shared/r128.h b/shared/r128.h index bcee91b5..1df7042a 100644 --- a/shared/r128.h +++ b/shared/r128.h @@ -36,7 +36,6 @@ /* General customization: */ - #define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc." #define DRIVER_NAME "r128" @@ -73,5 +72,4 @@ [DRM_IOCTL_NR(DRM_IOCTL_R128_INDIRECT)] = { r128_cce_indirect, 1, 1 }, \ [DRM_IOCTL_NR(DRM_IOCTL_R128_GETPARAM)] = { r128_getparam, 1, 0 }, - #endif diff --git a/shared/radeon_state.c b/shared/radeon_state.c index e67bdc0f..9675da92 100644 --- a/shared/radeon_state.c +++ b/shared/radeon_state.c @@ -2596,7 +2596,7 @@ static int radeon_driver_open_helper(drm_device_t *dev, drm_file_t *filp_priv) return 0; } -static void radeon_driver_free_filp_private(drm_device_t *dev, drm_file_t *filp_priv) +static void radeon_driver_free_filp_priv(drm_device_t *dev, drm_file_t *filp_priv) { struct drm_radeon_driver_file_fields *radeon_priv = filp_priv->driver_priv; @@ -2618,5 +2618,5 @@ void radeon_driver_register_fns(struct drm_device *dev) dev->fn_tbl.irq_postinstall = radeon_driver_irq_postinstall; dev->fn_tbl.irq_uninstall = radeon_driver_irq_uninstall; dev->fn_tbl.irq_handler = radeon_driver_irq_handler; - dev->fn_tbl.free_filp_private = radeon_driver_free_filp_private; + dev->fn_tbl.free_filp_priv = radeon_driver_free_filp_priv; } |