diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-01-08 13:13:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-01-08 13:13:58 +1100 |
| commit | a415a859e1c440b364fe03794e6ec7c381c9db94 (patch) | |
| tree | 33718a96d4f959589b4ffacee121a1a2ffa55421 | |
| parent | c8e1bdfa8bff41cf5f7bab67e0b0ca2227419d1c (diff) | |
| parent | fa72d143471d04ce3055d8dad9743b08c19e4060 (diff) | |
| download | linux-next-a415a859e1c440b364fe03794e6ec7c381c9db94.tar.gz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c index 4c1a00f9929e47..6802efb4d6cdc8 100644 --- a/drivers/hsi/controllers/omap_ssi_core.c +++ b/drivers/hsi/controllers/omap_ssi_core.c @@ -355,7 +355,7 @@ static int ssi_add_controller(struct hsi_controller *ssi, if (!omap_ssi) return -ENOMEM; - err = ida_simple_get(&platform_omap_ssi_ida, 0, 0, GFP_KERNEL); + err = ida_alloc(&platform_omap_ssi_ida, GFP_KERNEL); if (err < 0) return err; ssi->id = err; @@ -417,7 +417,7 @@ static int ssi_add_controller(struct hsi_controller *ssi, return 0; out_err: - ida_simple_remove(&platform_omap_ssi_ida, ssi->id); + ida_free(&platform_omap_ssi_ida, ssi->id); return err; } @@ -451,7 +451,7 @@ static void ssi_remove_controller(struct hsi_controller *ssi) tasklet_kill(&omap_ssi->gdd_tasklet); hsi_unregister_controller(ssi); clk_notifier_unregister(omap_ssi->fck, &omap_ssi->fck_nb); - ida_simple_remove(&platform_omap_ssi_ida, id); + ida_free(&platform_omap_ssi_ida, id); } static inline int ssi_of_get_available_ports_count(const struct device_node *np) |