mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-29 17:35:36 -04:00
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
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user