From: Mark Brown <broonie@kernel.org>
Date: Wed, 10 Dec 2014 17:40:53 +0000 (+0000)
Subject: spi: Move queue data structure initialisation to main master init
X-Git-Tag: firefly_0821_release~176^2~2405^2~3^4~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5424d43e4daddf71aaa60d6565c8816af9150adf;p=firefly-linux-kernel-4.4.55.git

spi: Move queue data structure initialisation to main master init

Since most devices now do use the standard queue and in order to avoid
initialisation ordering issues being introduced by further refactorings
to improve performance move the initialisation of the queue and the lock
for it to the main master allocation.

Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index da7e6225b8f6..b81ccdb1bc16 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -989,9 +989,6 @@ static int spi_init_queue(struct spi_master *master)
 {
 	struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 };
 
-	INIT_LIST_HEAD(&master->queue);
-	spin_lock_init(&master->queue_lock);
-
 	master->running = false;
 	master->busy = false;
 
@@ -1595,6 +1592,8 @@ int spi_register_master(struct spi_master *master)
 		dynamic = 1;
 	}
 
+	INIT_LIST_HEAD(&master->queue);
+	spin_lock_init(&master->queue_lock);
 	spin_lock_init(&master->bus_lock_spinlock);
 	mutex_init(&master->bus_lock_mutex);
 	master->bus_lock_flag = 0;