[PATCH 3/3] drm: Remove __drm_modeset_lock_all

[Daniel Vetter]

The last user is gone, no need for trylocking any more in this legacy
helper.

Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
 drivers/gpu/drm/drm_modeset_lock.c | 52 ++++++++------------------------------
 include/drm/drm_modeset_lock.h     |  1 -
 2 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/drivers/gpu/drm/drm_modeset_lock.c 
b/drivers/gpu/drm/drm_modeset_lock.c
index b4ddd1801642..9abee87c1501 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -53,41 +53,27 @@
  *     drm_modeset_acquire_fini(&ctx);
  */

-
 /**
- * __drm_modeset_lock_all - internal helper to grab all modeset locks
- * @dev: DRM device
- * @trylock: trylock mode for atomic contexts
- *
- * This is a special version of drm_modeset_lock_all() which can also be used 
in
- * atomic contexts. Then @trylock must be set to true.
+ * drm_modeset_lock_all - take all modeset locks
+ * @dev: drm device
  *
- * Returns:
- * 0 on success or negative error code on failure.
+ * This function takes all modeset locks, suitable where a more fine-grained
+ * scheme isn't (yet) implemented. Locks must be dropped with
+ * drm_modeset_unlock_all.
  */
-int __drm_modeset_lock_all(struct drm_device *dev,
-                          bool trylock)
+void drm_modeset_lock_all(struct drm_device *dev)
 {
        struct drm_mode_config *config = &dev->mode_config;
        struct drm_modeset_acquire_ctx *ctx;
        int ret;

-       ctx = kzalloc(sizeof(*ctx),
-                     trylock ? GFP_ATOMIC : GFP_KERNEL);
-       if (!ctx)
-               return -ENOMEM;
+       ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+       if (WARN_ON(!ctx))
+               return;

-       if (trylock) {
-               if (!mutex_trylock(&config->mutex)) {
-                       ret = -EBUSY;
-                       goto out;
-               }
-       } else {
-               mutex_lock(&config->mutex);
-       }
+       mutex_lock(&config->mutex);

        drm_modeset_acquire_init(ctx, 0);
-       ctx->trylock_only = trylock;

 retry:
        ret = drm_modeset_lock(&config->connection_mutex, ctx);
@@ -106,7 +92,7 @@ retry:

        drm_warn_on_modeset_not_all_locked(dev);

-       return 0;
+       return;

 fail:
        if (ret == -EDEADLK) {
@@ -114,23 +100,7 @@ fail:
                goto retry;
        }

-out:
        kfree(ctx);
-       return ret;
-}
-EXPORT_SYMBOL(__drm_modeset_lock_all);
-
-/**
- * drm_modeset_lock_all - take all modeset locks
- * @dev: drm device
- *
- * This function takes all modeset locks, suitable where a more fine-grained
- * scheme isn't (yet) implemented. Locks must be dropped with
- * drm_modeset_unlock_all.
- */
-void drm_modeset_lock_all(struct drm_device *dev)
-{
-       WARN_ON(__drm_modeset_lock_all(dev, false) != 0);
 }
 EXPORT_SYMBOL(drm_modeset_lock_all);

diff --git a/include/drm/drm_modeset_lock.h b/include/drm/drm_modeset_lock.h
index 70595ff565ba..5dd18bfdf601 100644
--- a/include/drm/drm_modeset_lock.h
+++ b/include/drm/drm_modeset_lock.h
@@ -130,7 +130,6 @@ struct drm_crtc;
 struct drm_plane;

 void drm_modeset_lock_all(struct drm_device *dev);
-int __drm_modeset_lock_all(struct drm_device *dev, bool trylock);
 void drm_modeset_unlock_all(struct drm_device *dev);
 void drm_modeset_lock_crtc(struct drm_crtc *crtc,
                           struct drm_plane *plane);
-- 
2.1.4