Commit 5facae4f authored by Qian Cai's avatar Qian Cai Committed by Ingo Molnar
Browse files

locking/lockdep: Remove unused @nested argument from lock_release() 



Since the following commit:

  b4adfe8e ("locking/lockdep: Remove unused argument in __lock_release")

@nested is no longer used in lock_release(), so remove it from all
lock_release() calls and friends.

Signed-off-by: default avatarQian Cai <cai@lca.pw>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarWill Deacon <will@kernel.org>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: airlied@linux.ie
Cc: akpm@linux-foundation.org
Cc: alexander.levin@microsoft.com
Cc: daniel@iogearbox.net
Cc: davem@davemloft.net
Cc: dri-devel@lists.freedesktop.org
Cc: duyuyang@gmail.com
Cc: gregkh@linuxfoundation.org
Cc: hannes@cmpxchg.org
Cc: intel-gfx@lists.freedesktop.org
Cc: jack@suse.com
Cc: jlbec@evilplan.or
Cc: joonas.lahtinen@linux.intel.com
Cc: joseph.qi@linux.alibaba.com
Cc: jslaby@suse.com
Cc: juri.lelli@redhat.com
Cc: maarten.lankhorst@linux.intel.com
Cc: mark@fasheh.com
Cc: mhocko@kernel.org
Cc: mripard@kernel.org
Cc: ocfs2-devel@oss.oracle.com
Cc: rodrigo.vivi@intel.com
Cc: sean@poorly.run
Cc: st@kernel.org
Cc: tj@kernel.org
Cc: tytso@mit.edu
Cc: vdavydov.dev@gmail.com
Cc: vincent.guittot@linaro.org
Cc: viro@zeniv.linux.org.uk
Link: https://lkml.kernel.org/r/1568909380-32199-1-git-send-email-cai@lca.pw


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e950cca3

drivers/gpu/drm/drm_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ void drm_connector_list_iter_end(struct drm_connector_list_iter *iter) 
		__drm_connector_put_safe(iter->conn);

		spin_unlock_irqrestore(&config->connector_list_lock, flags);

	}

	lock_release(&connector_list_iter_dep_map, 0, _RET_IP_);

	lock_release(&connector_list_iter_dep_map, _RET_IP_);

}

EXPORT_SYMBOL(drm_connector_list_iter_end);

drivers/gpu/drm/i915/gem/i915_gem_shrinker.c

+3 −3
Original line number Diff line number Diff line
@@ -509,14 +509,14 @@ void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915, 
		      I915_MM_SHRINKER, 0, _RET_IP_);



	mutex_acquire(&mutex->dep_map, 0, 0, _RET_IP_);

	mutex_release(&mutex->dep_map, 0, _RET_IP_);

	mutex_release(&mutex->dep_map, _RET_IP_);



	mutex_release(&i915->drm.struct_mutex.dep_map, 0, _RET_IP_);

	mutex_release(&i915->drm.struct_mutex.dep_map, _RET_IP_);



	fs_reclaim_release(GFP_KERNEL);



	if (unlock)

		mutex_release(&i915->drm.struct_mutex.dep_map, 0, _RET_IP_);

		mutex_release(&i915->drm.struct_mutex.dep_map, _RET_IP_);

}



#define obj_to_i915(obj__) to_i915((obj__)->base.dev)

drivers/gpu/drm/i915/gt/intel_engine_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static inline unsigned long __timeline_mark_lock(struct intel_context *ce) 
static inline void __timeline_mark_unlock(struct intel_context *ce,

					  unsigned long flags)

{

	mutex_release(&ce->timeline->mutex.dep_map, 0, _THIS_IP_);

	mutex_release(&ce->timeline->mutex.dep_map, _THIS_IP_);

	local_irq_restore(flags);

}

drivers/gpu/drm/i915/i915_request.c

+1 −1
Original line number Diff line number Diff line
@@ -1456,7 +1456,7 @@ long i915_request_wait(struct i915_request *rq, 
	dma_fence_remove_callback(&rq->fence, &wait.cb);



out:

	mutex_release(&rq->engine->gt->reset.mutex.dep_map, 0, _THIS_IP_);

	mutex_release(&rq->engine->gt->reset.mutex.dep_map, _THIS_IP_);

	trace_i915_request_wait_end(rq);

	return timeout;

}

drivers/tty/tty_ldsem.c

+4 −4
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static int __ldsem_down_read_nested(struct ld_semaphore *sem, 
	if (count <= 0) {

		lock_contended(&sem->dep_map, _RET_IP_);

		if (!down_read_failed(sem, count, timeout)) {

			rwsem_release(&sem->dep_map, 1, _RET_IP_);

			rwsem_release(&sem->dep_map, _RET_IP_);

			return 0;

		}

	}
@@ -322,7 +322,7 @@ static int __ldsem_down_write_nested(struct ld_semaphore *sem, 
	if ((count & LDSEM_ACTIVE_MASK) != LDSEM_ACTIVE_BIAS) {

		lock_contended(&sem->dep_map, _RET_IP_);

		if (!down_write_failed(sem, count, timeout)) {

			rwsem_release(&sem->dep_map, 1, _RET_IP_);

			rwsem_release(&sem->dep_map, _RET_IP_);

			return 0;

		}

	}
@@ -390,7 +390,7 @@ void ldsem_up_read(struct ld_semaphore *sem) 
{

	long count;



	rwsem_release(&sem->dep_map, 1, _RET_IP_);

	rwsem_release(&sem->dep_map, _RET_IP_);



	count = atomic_long_add_return(-LDSEM_READ_BIAS, &sem->count);

	if (count < 0 && (count & LDSEM_ACTIVE_MASK) == 0)
@@ -404,7 +404,7 @@ void ldsem_up_write(struct ld_semaphore *sem) 
{

	long count;



	rwsem_release(&sem->dep_map, 1, _RET_IP_);

	rwsem_release(&sem->dep_map, _RET_IP_);



	count = atomic_long_add_return(-LDSEM_WRITE_BIAS, &sem->count);

	if (count < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE