diff options
Diffstat (limited to 'drivers/char/drm/i830_irq.c')
-rw-r--r-- | drivers/char/drm/i830_irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/i830_irq.c b/drivers/char/drm/i830_irq.c index a33db5f0967f..91ec2bb497e9 100644 --- a/drivers/char/drm/i830_irq.c +++ b/drivers/char/drm/i830_irq.c | |||
@@ -58,7 +58,7 @@ static int i830_emit_irq(struct drm_device * dev) | |||
58 | drm_i830_private_t *dev_priv = dev->dev_private; | 58 | drm_i830_private_t *dev_priv = dev->dev_private; |
59 | RING_LOCALS; | 59 | RING_LOCALS; |
60 | 60 | ||
61 | DRM_DEBUG("%s\n", __FUNCTION__); | 61 | DRM_DEBUG("%s\n", __func__); |
62 | 62 | ||
63 | atomic_inc(&dev_priv->irq_emitted); | 63 | atomic_inc(&dev_priv->irq_emitted); |
64 | 64 | ||
@@ -77,7 +77,7 @@ static int i830_wait_irq(struct drm_device * dev, int irq_nr) | |||
77 | unsigned long end = jiffies + HZ * 3; | 77 | unsigned long end = jiffies + HZ * 3; |
78 | int ret = 0; | 78 | int ret = 0; |
79 | 79 | ||
80 | DRM_DEBUG("%s\n", __FUNCTION__); | 80 | DRM_DEBUG("%s\n", __func__); |
81 | 81 | ||
82 | if (atomic_read(&dev_priv->irq_received) >= irq_nr) | 82 | if (atomic_read(&dev_priv->irq_received) >= irq_nr) |
83 | return 0; | 83 | return 0; |
@@ -124,7 +124,7 @@ int i830_irq_emit(struct drm_device *dev, void *data, | |||
124 | LOCK_TEST_WITH_RETURN(dev, file_priv); | 124 | LOCK_TEST_WITH_RETURN(dev, file_priv); |
125 | 125 | ||
126 | if (!dev_priv) { | 126 | if (!dev_priv) { |
127 | DRM_ERROR("%s called with no initialization\n", __FUNCTION__); | 127 | DRM_ERROR("%s called with no initialization\n", __func__); |
128 | return -EINVAL; | 128 | return -EINVAL; |
129 | } | 129 | } |
130 | 130 | ||
@@ -147,7 +147,7 @@ int i830_irq_wait(struct drm_device *dev, void *data, | |||
147 | drm_i830_irq_wait_t *irqwait = data; | 147 | drm_i830_irq_wait_t *irqwait = data; |
148 | 148 | ||
149 | if (!dev_priv) { | 149 | if (!dev_priv) { |
150 | DRM_ERROR("%s called with no initialization\n", __FUNCTION__); | 150 | DRM_ERROR("%s called with no initialization\n", __func__); |
151 | return -EINVAL; | 151 | return -EINVAL; |
152 | } | 152 | } |
153 | 153 | ||