]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
starfive: refresh e24 driver patch for v6.18
authorZhihao Xu <ngc7331@outlook.com>
Tue, 17 Feb 2026 12:11:48 +0000 (20:11 +0800)
committerZoltan HERPAI <wigyori@uid0.hu>
Tue, 21 Apr 2026 12:49:35 +0000 (14:49 +0200)
- Use ida_alloc(), ida_free() api instead of old ida_simple_* [1], [2]

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5ade60dda43c8906d4554374226c2eb11cc2ffba
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c8a09fc9664f79eeb66cdf4a2a34d5b6a239b727

Signed-off-by: Zhihao Xu <ngc7331@outlook.com>
target/linux/starfive/patches-6.18/0018-driver-e24-add-e24-driver.patch

index 9e853b2bde4e5224b6bcd382a96ff355f4a03822..cc5328f722e0ed443474c5e6e9546b74770ba6c7 100644 (file)
@@ -1795,7 +1795,7 @@ Signed-off-by: shanlong.li <shanlong.li@starfivetech.com>
 +              if (ret)
 +                      goto err_pm_disable;
 +      }
-+      nodeid = ida_simple_get(&e24_nodeid, 0, 0, GFP_KERNEL);
++      nodeid = ida_alloc(&e24_nodeid, GFP_KERNEL);
 +      if (nodeid < 0) {
 +              ret = nodeid;
 +              goto err_pm_disable;
@@ -1817,7 +1817,7 @@ Signed-off-by: shanlong.li <shanlong.li@starfivetech.com>
 +
 +      return PTR_ERR(e24_dev);
 +err_free_id:
-+      ida_simple_remove(&e24_nodeid, nodeid);
++      ida_free(&e24_nodeid, nodeid);
 +
 +err_pm_disable:
 +      pm_runtime_disable(e24_dev->dev);
@@ -1851,7 +1851,7 @@ Signed-off-by: shanlong.li <shanlong.li@starfivetech.com>
 +      misc_deregister(&e24_dev->miscdev);
 +      e24_free_pool(e24_dev->pool);
 +      kfree(e24_dev->address_map.entry);
-+      ida_simple_remove(&e24_nodeid, e24_dev->nodeid);
++      ida_free(&e24_nodeid, e24_dev->nodeid);
 +
 +      if (e24_dev->rx_channel)
 +              mbox_free_channel(e24_dev->rx_channel);