Commit 5d197e97 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hsi-for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Pull HSI update from Sebastian Reichel:

 - modernize IDA API

* tag 'hsi-for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: omap_ssi: Remove usage of the deprecated ida_simple_xx() API
parents 75afd029 fa72d143
...@@ -355,7 +355,7 @@ static int ssi_add_controller(struct hsi_controller *ssi, ...@@ -355,7 +355,7 @@ static int ssi_add_controller(struct hsi_controller *ssi,
if (!omap_ssi) if (!omap_ssi)
return -ENOMEM; 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) if (err < 0)
return err; return err;
ssi->id = err; ssi->id = err;
...@@ -417,7 +417,7 @@ static int ssi_add_controller(struct hsi_controller *ssi, ...@@ -417,7 +417,7 @@ static int ssi_add_controller(struct hsi_controller *ssi,
return 0; return 0;
out_err: out_err:
ida_simple_remove(&platform_omap_ssi_ida, ssi->id); ida_free(&platform_omap_ssi_ida, ssi->id);
return err; return err;
} }
...@@ -451,7 +451,7 @@ static void ssi_remove_controller(struct hsi_controller *ssi) ...@@ -451,7 +451,7 @@ static void ssi_remove_controller(struct hsi_controller *ssi)
tasklet_kill(&omap_ssi->gdd_tasklet); tasklet_kill(&omap_ssi->gdd_tasklet);
hsi_unregister_controller(ssi); hsi_unregister_controller(ssi);
clk_notifier_unregister(omap_ssi->fck, &omap_ssi->fck_nb); 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) static inline int ssi_of_get_available_ports_count(const struct device_node *np)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment