mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
spi: Kernel coding style fixes
Earlier commit: "spi: Pick spi bus number from Linux idr or spi alias" (SHA1:9b61e302210eba55768962f2f11e96bb508c2408) has introduced some checkpatch issues. As pointed by Lukas Wunner this patch does the following: - remove whitespaces - fix warnings, suspect code indent for conditional statements - fix errors, code indent should use tabs - remove spaces at the start of the line Signed-off-by: Suniel Mahesh <sunil.m@techveda.org> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
9b61e30221
commit
9a9a047a39
1 changed files with 12 additions and 17 deletions
|
@ -424,7 +424,7 @@ static LIST_HEAD(spi_controller_list);
|
||||||
/*
|
/*
|
||||||
* Used to protect add/del opertion for board_info list and
|
* Used to protect add/del opertion for board_info list and
|
||||||
* spi_controller list, and their matching process
|
* spi_controller list, and their matching process
|
||||||
* also used to protect object of type struct idr
|
* also used to protect object of type struct idr
|
||||||
*/
|
*/
|
||||||
static DEFINE_MUTEX(board_lock);
|
static DEFINE_MUTEX(board_lock);
|
||||||
|
|
||||||
|
@ -2075,7 +2075,6 @@ int spi_register_controller(struct spi_controller *ctlr)
|
||||||
*/
|
*/
|
||||||
if (ctlr->num_chipselect == 0)
|
if (ctlr->num_chipselect == 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* allocate dynamic bus number using Linux idr */
|
/* allocate dynamic bus number using Linux idr */
|
||||||
if ((ctlr->bus_num < 0) && ctlr->dev.of_node) {
|
if ((ctlr->bus_num < 0) && ctlr->dev.of_node) {
|
||||||
id = of_alias_get_id(ctlr->dev.of_node, "spi");
|
id = of_alias_get_id(ctlr->dev.of_node, "spi");
|
||||||
|
@ -2090,16 +2089,14 @@ int spi_register_controller(struct spi_controller *ctlr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ctlr->bus_num < 0) {
|
if (ctlr->bus_num < 0) {
|
||||||
mutex_lock(&board_lock);
|
mutex_lock(&board_lock);
|
||||||
id = idr_alloc(&spi_master_idr, ctlr,
|
id = idr_alloc(&spi_master_idr, ctlr, SPI_DYN_FIRST_BUS_NUM, 0,
|
||||||
SPI_DYN_FIRST_BUS_NUM, 0, GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
mutex_unlock(&board_lock);
|
mutex_unlock(&board_lock);
|
||||||
if (WARN(id < 0, "couldn't get idr"))
|
if (WARN(id < 0, "couldn't get idr"))
|
||||||
return id;
|
return id;
|
||||||
|
ctlr->bus_num = id;
|
||||||
ctlr->bus_num = id;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
INIT_LIST_HEAD(&ctlr->queue);
|
INIT_LIST_HEAD(&ctlr->queue);
|
||||||
spin_lock_init(&ctlr->queue_lock);
|
spin_lock_init(&ctlr->queue_lock);
|
||||||
spin_lock_init(&ctlr->bus_lock_spinlock);
|
spin_lock_init(&ctlr->bus_lock_spinlock);
|
||||||
|
@ -2222,18 +2219,16 @@ void spi_unregister_controller(struct spi_controller *ctlr)
|
||||||
mutex_lock(&board_lock);
|
mutex_lock(&board_lock);
|
||||||
found = idr_find(&spi_master_idr, ctlr->bus_num);
|
found = idr_find(&spi_master_idr, ctlr->bus_num);
|
||||||
mutex_unlock(&board_lock);
|
mutex_unlock(&board_lock);
|
||||||
if (found != ctlr) {
|
if (found != ctlr) {
|
||||||
dev_dbg(&ctlr->dev,
|
dev_dbg(&ctlr->dev,
|
||||||
"attempting to delete unregistered controller [%s]\n",
|
"attempting to delete unregistered controller [%s]\n",
|
||||||
dev_name(&ctlr->dev));
|
dev_name(&ctlr->dev));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ctlr->queued) {
|
if (ctlr->queued) {
|
||||||
if (spi_destroy_queue(ctlr))
|
if (spi_destroy_queue(ctlr))
|
||||||
dev_err(&ctlr->dev, "queue remove failed\n");
|
dev_err(&ctlr->dev, "queue remove failed\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
mutex_lock(&board_lock);
|
mutex_lock(&board_lock);
|
||||||
list_del(&ctlr->list);
|
list_del(&ctlr->list);
|
||||||
mutex_unlock(&board_lock);
|
mutex_unlock(&board_lock);
|
||||||
|
|
Loading…
Reference in a new issue