diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-10-09 22:30:23 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-10-09 22:30:23 -0700 |
| commit | 5f8f8574c7f5585b09a9623f0f13462e4eb67b4d (patch) | |
| tree | 8f1d5e88bf9604a9e39fbcce0e37b3d8cee451bb /drivers/mcb | |
| parent | e62563db857f81d75c5726a35bc0180bed6d1540 (diff) | |
| parent | fe5b6aaef72a0f7daa06e7960e0bee45c2984e41 (diff) | |
| download | linux-5f8f8574c7f5585b09a9623f0f13462e4eb67b4d.tar.gz linux-5f8f8574c7f5585b09a9623f0f13462e4eb67b4d.tar.bz2 linux-5f8f8574c7f5585b09a9623f0f13462e4eb67b4d.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.1 merge window.
Diffstat (limited to 'drivers/mcb')
| -rw-r--r-- | drivers/mcb/mcb-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mcb/mcb-core.c b/drivers/mcb/mcb-core.c index cf128b3471d7..338fc889b357 100644 --- a/drivers/mcb/mcb-core.c +++ b/drivers/mcb/mcb-core.c @@ -254,7 +254,7 @@ static void mcb_free_bus(struct device *dev) struct mcb_bus *bus = to_mcb_bus(dev); put_device(bus->carrier); - ida_simple_remove(&mcb_ida, bus->bus_nr); + ida_free(&mcb_ida, bus->bus_nr); kfree(bus); } @@ -273,7 +273,7 @@ struct mcb_bus *mcb_alloc_bus(struct device *carrier) if (!bus) return ERR_PTR(-ENOMEM); - bus_nr = ida_simple_get(&mcb_ida, 0, 0, GFP_KERNEL); + bus_nr = ida_alloc(&mcb_ida, GFP_KERNEL); if (bus_nr < 0) { kfree(bus); return ERR_PTR(bus_nr); |