[PATCH] staging: greybus: uart: convert from IDR to XArray

From: Philipp Prell

Date: Wed Nov 18 2026 - 11:02:02 EST


The IDR API is deprecated in favour of XArray, see
Documentation/core-api/idr.rst. Convert the
minor table accordingly.

XA_LIMIT is inclusive, so the upper bound becomes
GB_NUM_MINORS - 1 in alloc_minor(). xa_alloc()
returns -EBUSY instead of -ENOSPC when full;
adjust the check in gb_uart_probe().

table_lock is kept: it prevents the entry from
being freed, while get_gb_by_minor() uses it,
whereas the XArray lock only protects the array
itself.

Signed-off-by: Philipp Prell <philipp.prell@xxxxxxxxxx>
---
Compile-tested only (W=1, C=1); I do not have the Greybus hardware.

An AI assistant (Claude) was used to review my changes and to point
out bugs in earlier drafts and to help with the wording of the commit message.
The code changes were written by me.

drivers/staging/greybus/uart.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index e1b73db6a17c..ff33991562f5 100644
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -22,7 +22,7 @@
#include <linux/serial.h>
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
-#include <linux/idr.h>
+#include <linux/xarray.h>
#include <linux/fs.h>
#include <linux/kdev_t.h>
#include <linux/kfifo.h>
@@ -66,7 +66,7 @@ struct gb_tty {
};

static struct tty_driver *gb_tty_driver;
-static DEFINE_IDR(tty_minors);
+static DEFINE_XARRAY_ALLOC(tty_minors);
static DEFINE_MUTEX(table_lock);

static int gb_uart_receive_data_handler(struct gb_operation *op)
@@ -341,7 +341,7 @@ static struct gb_tty *get_gb_by_minor(unsigned int minor)
struct gb_tty *gb_tty;

mutex_lock(&table_lock);
- gb_tty = idr_find(&tty_minors, minor);
+ gb_tty = xa_load(&tty_minors, minor);
if (gb_tty) {
mutex_lock(&gb_tty->mutex);
if (gb_tty->disconnected) {
@@ -358,13 +358,18 @@ static struct gb_tty *get_gb_by_minor(unsigned int minor)

static int alloc_minor(struct gb_tty *gb_tty)
{
- int minor;
+ u32 minor;
+ int ret;

mutex_lock(&table_lock);
- minor = idr_alloc(&tty_minors, gb_tty, 0, GB_NUM_MINORS, GFP_KERNEL);
+ ret = xa_alloc(&tty_minors, &minor, gb_tty,
+ XA_LIMIT(0, GB_NUM_MINORS - 1), GFP_KERNEL);
mutex_unlock(&table_lock);
- if (minor >= 0)
- gb_tty->minor = minor;
+
+ if (ret)
+ return ret;
+
+ gb_tty->minor = minor;
return minor;
}

@@ -374,7 +379,7 @@ static void release_minor(struct gb_tty *gb_tty)

gb_tty->minor = 0; /* Maybe should use an invalid value instead */
mutex_lock(&table_lock);
- idr_remove(&tty_minors, minor);
+ xa_erase(&tty_minors, minor);
mutex_unlock(&table_lock);
}

@@ -860,7 +865,7 @@ static int gb_uart_probe(struct gbphy_device *gbphy_dev,

minor = alloc_minor(gb_tty);
if (minor < 0) {
- if (minor == -ENOSPC) {
+ if (minor == -EBUSY) {
dev_err(&gbphy_dev->dev,
"no more free minor numbers\n");
retval = -ENODEV;
@@ -991,7 +996,7 @@ static void gb_tty_exit(void)
{
tty_unregister_driver(gb_tty_driver);
tty_driver_kref_put(gb_tty_driver);
- idr_destroy(&tty_minors);
+ xa_destroy(&tty_minors);
}

static const struct gbphy_device_id gb_uart_id_table[] = {

base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
--
2.56.0