|
@@ -237,15 +237,15 @@ struct drm_device;
|
|
|
* \param dev DRM device.
|
|
|
* \param filp file pointer of the caller.
|
|
|
*/
|
|
|
-#define LOCK_TEST_WITH_RETURN( dev, file_priv ) \
|
|
|
-do { \
|
|
|
- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock) || \
|
|
|
- file_priv->master->lock.file_priv != file_priv) { \
|
|
|
+#define LOCK_TEST_WITH_RETURN( dev, _file_priv ) \
|
|
|
+do { \
|
|
|
+ if (!_DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock) || \
|
|
|
+ _file_priv->master->lock.file_priv != _file_priv) { \
|
|
|
DRM_ERROR( "%s called without lock held, held %d owner %p %p\n",\
|
|
|
- __func__, _DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock),\
|
|
|
- file_priv->master->lock.file_priv, file_priv); \
|
|
|
- return -EINVAL; \
|
|
|
- } \
|
|
|
+ __func__, _DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock),\
|
|
|
+ _file_priv->master->lock.file_priv, _file_priv); \
|
|
|
+ return -EINVAL; \
|
|
|
+ } \
|
|
|
} while (0)
|
|
|
|
|
|
/**
|