diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 05:34:42 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-17 20:33:46 -0500 |
| commit | e9f0d76f3bcd4dda7136baaaaf45bda3b13ff40f (patch) | |
| tree | 557d43df25c4d6b40fee763d99c8844c7bd9c960 /include | |
| parent | bfd8303af0c46bd094289ee4e65f1e4bcc4fb7d3 (diff) | |
drm: Kill DRM_IRQ_ARGS
I've killed them a long time ago in drm/i915, let's get rid of this
remnant of shared drm core days for good.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drmP.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_os_linux.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 90a99807e48d..c34a2cc2d9b6 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
| @@ -915,7 +915,7 @@ struct drm_driver { | |||
| 915 | 915 | ||
| 916 | /* these have to be filled in */ | 916 | /* these have to be filled in */ |
| 917 | 917 | ||
| 918 | irqreturn_t(*irq_handler) (DRM_IRQ_ARGS); | 918 | irqreturn_t(*irq_handler) (int irq, void *arg); |
| 919 | void (*irq_preinstall) (struct drm_device *dev); | 919 | void (*irq_preinstall) (struct drm_device *dev); |
| 920 | int (*irq_postinstall) (struct drm_device *dev); | 920 | int (*irq_postinstall) (struct drm_device *dev); |
| 921 | void (*irq_uninstall) (struct drm_device *dev); | 921 | void (*irq_uninstall) (struct drm_device *dev); |
diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h index 42ce450420dd..2794cfeb4dfb 100644 --- a/include/drm/drm_os_linux.h +++ b/include/drm/drm_os_linux.h | |||
| @@ -48,9 +48,6 @@ static inline void writeq(u64 val, void __iomem *reg) | |||
| 48 | /** Read/write memory barrier */ | 48 | /** Read/write memory barrier */ |
| 49 | #define DRM_MEMORYBARRIER() mb() | 49 | #define DRM_MEMORYBARRIER() mb() |
| 50 | 50 | ||
| 51 | /** IRQ handler arguments and return type and values */ | ||
| 52 | #define DRM_IRQ_ARGS int irq, void *arg | ||
| 53 | |||
| 54 | /** Other copying of data to kernel space */ | 51 | /** Other copying of data to kernel space */ |
| 55 | #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ | 52 | #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ |
| 56 | copy_from_user(arg1, arg2, arg3) | 53 | copy_from_user(arg1, arg2, arg3) |
