diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 15:32:17 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 15:32:17 +1000 |
| commit | 54cd4605434a0018ce447b6f689078912eee756f (patch) | |
| tree | 108d0c39e196d234ce7abe2827afab7125e38a45 | |
| parent | 5e091a528c98ffb1c2342dee0faa4c0de8d6df56 (diff) | |
| parent | 4ad3deabeea21f9fda6a49de10fd417c4199ffaf (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git
| -rw-r--r-- | drivers/slimbus/core.c | 6 | ||||
| -rw-r--r-- | drivers/slimbus/messaging.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c index 78480e332ab8..219483b79c09 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -250,7 +250,7 @@ int slim_register_controller(struct slim_controller *ctrl) { int id; - id = ida_simple_get(&ctrl_ida, 0, 0, GFP_KERNEL); + id = ida_alloc(&ctrl_ida, GFP_KERNEL); if (id < 0) return id; @@ -299,7 +299,7 @@ int slim_unregister_controller(struct slim_controller *ctrl) { /* Remove all clients */ device_for_each_child(ctrl->dev, NULL, slim_ctrl_remove_device); - ida_simple_remove(&ctrl_ida, ctrl->id); + ida_free(&ctrl_ida, ctrl->id); return 0; } @@ -323,7 +323,7 @@ void slim_report_absent(struct slim_device *sbdev) sbdev->is_laddr_valid = false; mutex_unlock(&ctrl->lock); if (!ctrl->get_laddr) - ida_simple_remove(&ctrl->laddr_ida, sbdev->laddr); + ida_free(&ctrl->laddr_ida, sbdev->laddr); slim_device_update_status(sbdev, SLIM_DEVICE_STATUS_DOWN); } EXPORT_SYMBOL_GPL(slim_report_absent); diff --git a/drivers/slimbus/messaging.c b/drivers/slimbus/messaging.c index e5ae26227bdb..4ce0cb61e481 100644 --- a/drivers/slimbus/messaging.c +++ b/drivers/slimbus/messaging.c @@ -79,7 +79,7 @@ int slim_alloc_txn_tid(struct slim_controller *ctrl, struct slim_msg_txn *txn) EXPORT_SYMBOL_GPL(slim_alloc_txn_tid); /** - * slim_free_txn_tid() - Freee tid of txn + * slim_free_txn_tid() - Free tid of txn * * @ctrl: Controller handle * @txn: transaction whose tid should be freed @@ -101,7 +101,7 @@ EXPORT_SYMBOL_GPL(slim_free_txn_tid); * @txn: Transaction to be sent over SLIMbus * * Called by controller to transmit messaging transactions not dealing with - * Interface/Value elements. (e.g. transmittting a message to assign logical + * Interface/Value elements. (e.g. transmitting a message to assign logical * address to a slave device * * Return: -ETIMEDOUT: If transmission of this message timed out |