mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 17:01:44 +04:00
starfive: refresh e24 driver patch for v6.18
- 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>
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user