From: keliu <liuke94@huawei.com>
Date: Fri, 27 May 2022 06:42:25 +0000 (+0000)
Subject: net: nfc: Directly use ida_alloc()/free()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=911799172d2f703cc14e9000c55d124d5e0a91a2;p=linux.git

net: nfc: Directly use ida_alloc()/free()

Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .

Signed-off-by: keliu <liuke94@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/nfc/core.c b/net/nfc/core.c
index 6ff3e10ff8e35..eb2c0959e5b6a 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -975,7 +975,7 @@ static void nfc_release(struct device *d)
 			kfree(se);
 	}
 
-	ida_simple_remove(&nfc_index_ida, dev->idx);
+	ida_free(&nfc_index_ida, dev->idx);
 
 	kfree(dev);
 }
@@ -1066,7 +1066,7 @@ struct nfc_dev *nfc_allocate_device(const struct nfc_ops *ops,
 	if (!dev)
 		return NULL;
 
-	rc = ida_simple_get(&nfc_index_ida, 0, 0, GFP_KERNEL);
+	rc = ida_alloc(&nfc_index_ida, GFP_KERNEL);
 	if (rc < 0)
 		goto err_free_dev;
 	dev->idx = rc;