Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
index 82d3e28918fd..6a567fe347b3 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
@@ -48,10 +48,8 @@ void nvkm_timer_alarm_cancel(struct nvkm_timer *, struct nvkm_alarm *);
         } while (_taken = nvkm_timer_read(_tmr) - _time0, _taken < _nsecs);    \
                                                                                \
         if (_taken >= _nsecs) {                                                \
-                if (_warn) {                                                   \
-                        dev_warn(_device->dev, "timeout at %s:%d/%s()!\n",     \
-                                 __FILE__, __LINE__, __func__);                \
-                }                                                              \
+                if (_warn)                                                     \
+                        dev_WARN(_device->dev, "timeout\n");                   \
                 _taken = -ETIMEDOUT;                                           \
         }                                                                      \
         _taken;                                                                \