aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_perf.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-07-03 06:39:46 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-11-28 11:06:58 -0500
commitafc9a42b7464f76e1388cad87d8543c69f6f74ed (patch)
treeabc3abe50053edd3dcf0b04c2d2a63640ee89f6b /drivers/gpu/drm/i915/i915_perf.c
parentc23e0cb81e4021b9712b1093d54713991fd9b7c2 (diff)
the rest of drivers/*: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_perf.c')
-rw-r--r--drivers/gpu/drm/i915/i915_perf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 59ee808f8fd9..d453756ca128 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -2331,12 +2331,12 @@ static enum hrtimer_restart oa_poll_check_timer_cb(struct hrtimer *hrtimer)
2331 * 2331 *
2332 * Returns: any poll events that are ready without sleeping 2332 * Returns: any poll events that are ready without sleeping
2333 */ 2333 */
2334static unsigned int i915_perf_poll_locked(struct drm_i915_private *dev_priv, 2334static __poll_t i915_perf_poll_locked(struct drm_i915_private *dev_priv,
2335 struct i915_perf_stream *stream, 2335 struct i915_perf_stream *stream,
2336 struct file *file, 2336 struct file *file,
2337 poll_table *wait) 2337 poll_table *wait)
2338{ 2338{
2339 unsigned int events = 0; 2339 __poll_t events = 0;
2340 2340
2341 stream->ops->poll_wait(stream, file, wait); 2341 stream->ops->poll_wait(stream, file, wait);
2342 2342
@@ -2365,11 +2365,11 @@ static unsigned int i915_perf_poll_locked(struct drm_i915_private *dev_priv,
2365 * 2365 *
2366 * Returns: any poll events that are ready without sleeping 2366 * Returns: any poll events that are ready without sleeping
2367 */ 2367 */
2368static unsigned int i915_perf_poll(struct file *file, poll_table *wait) 2368static __poll_t i915_perf_poll(struct file *file, poll_table *wait)
2369{ 2369{
2370 struct i915_perf_stream *stream = file->private_data; 2370 struct i915_perf_stream *stream = file->private_data;
2371 struct drm_i915_private *dev_priv = stream->dev_priv; 2371 struct drm_i915_private *dev_priv = stream->dev_priv;
2372 int ret; 2372 __poll_t ret;
2373 2373
2374 mutex_lock(&dev_priv->perf.lock); 2374 mutex_lock(&dev_priv->perf.lock);
2375 ret = i915_perf_poll_locked(dev_priv, stream, file, wait); 2375 ret = i915_perf_poll_locked(dev_priv, stream, file, wait);