From nobody Tue Apr 28 23:19:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13981C433F5 for ; Sat, 28 May 2022 11:14:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243172AbiE1LOb (ORCPT ); Sat, 28 May 2022 07:14:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234274AbiE1LO0 (ORCPT ); Sat, 28 May 2022 07:14:26 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44EF41F606 for ; Sat, 28 May 2022 04:14:25 -0700 (PDT) Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4L9Jrm3qcrzRhRL; Sat, 28 May 2022 19:11:20 +0800 (CST) Received: from dggpemm500018.china.huawei.com (7.185.36.111) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 28 May 2022 19:14:23 +0800 Received: from localhost.localdomain (10.175.112.125) by dggpemm500018.china.huawei.com (7.185.36.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 28 May 2022 19:14:23 +0800 From: Ke Liu To: CC: , , , , , Ke Liu Subject: [PATCH v2] drivers: fsi: Directly use ida_alloc()/free() Date: Sat, 28 May 2022 11:35:52 +0000 Message-ID: <20220528113552.1889871-1-liuke94@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500018.china.huawei.com (7.185.36.111) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use ida_alloc()/ida_free() instead of deprecated ida_simple_get()/ida_simple_remove(). Signed-off-by: Ke Liu --- v2 fix some bad modify --- drivers/fsi/fsi-core.c | 14 +++++++------- drivers/fsi/fsi-occ.c | 17 ++++++++--------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index 3a7b78e36701..10ef611058f0 100644 --- a/drivers/fsi/fsi-core.c +++ b/drivers/fsi/fsi-core.c @@ -951,7 +951,7 @@ static int __fsi_get_new_minor(struct fsi_slave *slave,= enum fsi_dev_type type, if (cid >=3D 0 && cid < 16 && type < 4) { /* Try reserving the legacy number */ id =3D (cid << 4) | type; - id =3D ida_simple_get(&fsi_minor_ida, id, id + 1, GFP_KERNEL); + id =3D ida_alloc_range(&fsi_minor_ida, id, id, GFP_KERNEL); if (id >=3D 0) { *out_index =3D fsi_adjust_index(cid); *out_dev =3D fsi_base_dev + id; @@ -962,8 +962,8 @@ static int __fsi_get_new_minor(struct fsi_slave *slave,= enum fsi_dev_type type, return id; /* Fallback to non-legacy allocation */ } - id =3D ida_simple_get(&fsi_minor_ida, FSI_CHAR_LEGACY_TOP, - FSI_CHAR_MAX_DEVICES, GFP_KERNEL); + id =3D ida_alloc_range(&fsi_minor_ida, FSI_CHAR_LEGACY_TOP, + FSI_CHAR_MAX_DEVICES - 1, GFP_KERNEL); if (id < 0) return id; *out_index =3D fsi_adjust_index(id); @@ -980,7 +980,7 @@ EXPORT_SYMBOL_GPL(fsi_get_new_minor); =20 void fsi_free_minor(dev_t dev) { - ida_simple_remove(&fsi_minor_ida, MINOR(dev)); + ida_free(&fsi_minor_ida, MINOR(dev)); } EXPORT_SYMBOL_GPL(fsi_free_minor); =20 @@ -1313,13 +1313,13 @@ int fsi_master_register(struct fsi_master *master) struct device_node *np; =20 mutex_init(&master->scan_lock); - master->idx =3D ida_simple_get(&master_ida, 0, INT_MAX, GFP_KERNEL); + master->idx =3D ida_alloc(&master_ida, GFP_KERNEL); dev_set_name(&master->dev, "fsi%d", master->idx); master->dev.class =3D &fsi_master_class; =20 rc =3D device_register(&master->dev); if (rc) { - ida_simple_remove(&master_ida, master->idx); + ida_free(&master_ida, master->idx); return rc; } =20 @@ -1337,7 +1337,7 @@ EXPORT_SYMBOL_GPL(fsi_master_register); void fsi_master_unregister(struct fsi_master *master) { if (master->idx >=3D 0) { - ida_simple_remove(&master_ida, master->idx); + ida_free(&master_ida, master->idx); master->idx =3D -1; } =20 diff --git a/drivers/fsi/fsi-occ.c b/drivers/fsi/fsi-occ.c index c9cc75fbdfb9..63af5cad1015 100644 --- a/drivers/fsi/fsi-occ.c +++ b/drivers/fsi/fsi-occ.c @@ -630,17 +630,16 @@ static int occ_probe(struct platform_device *pdev) rc =3D of_property_read_u32(dev->of_node, "reg", ®); if (!rc) { /* make sure we don't have a duplicate from dts */ - occ->idx =3D ida_simple_get(&occ_ida, reg, reg + 1, - GFP_KERNEL); + occ->idx =3D ida_alloc_range(&occ_ida, reg, reg, + GFP_KERNEL); if (occ->idx < 0) - occ->idx =3D ida_simple_get(&occ_ida, 1, INT_MAX, - GFP_KERNEL); + occ->idx =3D ida_alloc_min(&occ_ida, 1, + GFP_KERNEL); } else { - occ->idx =3D ida_simple_get(&occ_ida, 1, INT_MAX, - GFP_KERNEL); + occ->idx =3D ida_alloc_min(&occ_ida, 1, GFP_KERNEL); } } else { - occ->idx =3D ida_simple_get(&occ_ida, 1, INT_MAX, GFP_KERNEL); + occ->idx =3D ida_alloc_min(&occ_ida, 1, GFP_KERNEL); } =20 platform_set_drvdata(pdev, occ); @@ -654,7 +653,7 @@ static int occ_probe(struct platform_device *pdev) rc =3D misc_register(&occ->mdev); if (rc) { dev_err(dev, "failed to register miscdevice: %d\n", rc); - ida_simple_remove(&occ_ida, occ->idx); + ida_free(&occ_ida, occ->idx); kvfree(occ->buffer); return rc; } @@ -677,7 +676,7 @@ static int occ_remove(struct platform_device *pdev) =20 device_for_each_child(&pdev->dev, NULL, occ_unregister_child); =20 - ida_simple_remove(&occ_ida, occ->idx); + ida_free(&occ_ida, occ->idx); =20 return 0; } --=20 2.25.1