Skip to contentSkip to conversation

most: Directly use ida_alloc()/free()

PATCH In review keliu 3 participants 4 messages May 27, 2022 Most(r) technology driver

lore
Share & tools
lore

keliu

author
#0 lore raw

PATCH 1/1 most: Directly use ida_alloc()/free()

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

---
 drivers/most/core.c      | 10 +++++-----
 drivers/most/most_cdev.c |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/most/core.c +5 -5
index e4412c7d25b0..81d60d4ee8c2 100644
@@ -1286,7 +1286,7 @@ int most_register_interface(struct most_interface *iface)
 	    !iface->poison_channel || (iface->num_channels > MAX_CHANNELS))
 		return -EINVAL;
 
-	id = ida_simple_get(&mdev_id, 0, 0, GFP_KERNEL);
+	id = ida_alloc(&mdev_id, GFP_KERNEL);
 	if (id < 0) {
 		dev_err(iface->dev, "Failed to allocate device ID\n");
 		return id;
@@ -1294,7 +1294,7 @@ int most_register_interface(struct most_interface *iface)
 
 	iface->p = kzalloc(sizeof(*iface->p), GFP_KERNEL);
 	if (!iface->p) {
-		ida_simple_remove(&mdev_id, id);
+		ida_free(&mdev_id, id);
 		return -ENOMEM;
 	}
 
@@ -1308,7 +1308,7 @@ int most_register_interface(struct most_interface *iface)
 		dev_err(iface->dev, "Failed to register interface device\n");
 		kfree(iface->p);
 		put_device(iface->dev);
-		ida_simple_remove(&mdev_id, id);
+		ida_free(&mdev_id, id);
 		return -ENOMEM;
 	}
 
@@ -1366,7 +1366,7 @@ int most_register_interface(struct most_interface *iface)
 	}
 	kfree(iface->p);
 	device_unregister(iface->dev);
-	ida_simple_remove(&mdev_id, id);
+	ida_free(&mdev_id, id);
 	return -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(most_register_interface);
@@ -1397,7 +1397,7 @@ void most_deregister_interface(struct most_interface *iface)
 		device_unregister(&c->dev);
 	}
 
-	ida_simple_remove(&mdev_id, iface->p->dev_id);
+	ida_free(&mdev_id, iface->p->dev_id);
 	kfree(iface->p);
 	device_unregister(iface->dev);
 }
drivers/most/most_cdev.c +3 -3
index 3722f9abd7b9..27913b1c8128 100644
@@ -100,7 +100,7 @@ static void destroy_cdev(struct comp_channel *c)
 
 static void destroy_channel(struct comp_channel *c)
 {
-	ida_simple_remove(&comp.minor_id, MINOR(c->devno));
+	ida_free(&comp.minor_id, MINOR(c->devno));
 	kfifo_free(&c->fifo);
 	kfree(c);
 }
@@ -424,7 +424,7 @@ static int comp_probe(struct most_interface *iface, int channel_id,
 	if (c)
 		return -EEXIST;
 
-	current_minor = ida_simple_get(&comp.minor_id, 0, 0, GFP_KERNEL);
+	current_minor = ida_alloc(&comp.minor_id, GFP_KERNEL);
 	if (current_minor < 0)
 		return current_minor;
 
@@ -471,7 +471,7 @@ static int comp_probe(struct most_interface *iface, int channel_id,
 err_free_c:
 	kfree(c);
 err_remove_ida:
-	ida_simple_remove(&comp.minor_id, current_minor);
+	ida_free(&comp.minor_id, current_minor);
 	return retval;
 }
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 4 lines · keliu

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

The Signed-off-by: needs a more complete name (unless that is your full name).

Do any of Christophe's comments apply here?

thanks.

Quoted 85 lines
---
 drivers/most/core.c      | 10 +++++-----
 drivers/most/most_cdev.c |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/most/core.c +5 -5
index e4412c7d25b0..81d60d4ee8c2 100644
@@ -1286,7 +1286,7 @@ int most_register_interface(struct most_interface *iface)
 	    !iface->poison_channel || (iface->num_channels > MAX_CHANNELS))
 		return -EINVAL;
 
-	id = ida_simple_get(&mdev_id, 0, 0, GFP_KERNEL);
+	id = ida_alloc(&mdev_id, GFP_KERNEL);
 	if (id < 0) {
 		dev_err(iface->dev, "Failed to allocate device ID\n");
 		return id;
@@ -1294,7 +1294,7 @@ int most_register_interface(struct most_interface *iface)
 
 	iface->p = kzalloc(sizeof(*iface->p), GFP_KERNEL);
 	if (!iface->p) {
-		ida_simple_remove(&mdev_id, id);
+		ida_free(&mdev_id, id);
 		return -ENOMEM;
 	}
 
@@ -1308,7 +1308,7 @@ int most_register_interface(struct most_interface *iface)
 		dev_err(iface->dev, "Failed to register interface device\n");
 		kfree(iface->p);
 		put_device(iface->dev);
-		ida_simple_remove(&mdev_id, id);
+		ida_free(&mdev_id, id);
 		return -ENOMEM;
 	}
 
@@ -1366,7 +1366,7 @@ int most_register_interface(struct most_interface *iface)
 	}
 	kfree(iface->p);
 	device_unregister(iface->dev);
-	ida_simple_remove(&mdev_id, id);
+	ida_free(&mdev_id, id);
 	return -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(most_register_interface);
@@ -1397,7 +1397,7 @@ void most_deregister_interface(struct most_interface *iface)
 		device_unregister(&c->dev);
 	}
 
-	ida_simple_remove(&mdev_id, iface->p->dev_id);
+	ida_free(&mdev_id, iface->p->dev_id);
 	kfree(iface->p);
 	device_unregister(iface->dev);
 }
drivers/most/most_cdev.c +3 -3
index 3722f9abd7b9..27913b1c8128 100644
@@ -100,7 +100,7 @@ static void destroy_cdev(struct comp_channel *c)
 
 static void destroy_channel(struct comp_channel *c)
 {
-	ida_simple_remove(&comp.minor_id, MINOR(c->devno));
+	ida_free(&comp.minor_id, MINOR(c->devno));
 	kfifo_free(&c->fifo);
 	kfree(c);
 }
@@ -424,7 +424,7 @@ static int comp_probe(struct most_interface *iface, int channel_id,
 	if (c)
 		return -EEXIST;
 
-	current_minor = ida_simple_get(&comp.minor_id, 0, 0, GFP_KERNEL);
+	current_minor = ida_alloc(&comp.minor_id, GFP_KERNEL);
 	if (current_minor < 0)
 		return current_minor;
 
@@ -471,7 +471,7 @@ static int comp_probe(struct most_interface *iface, int channel_id,
 err_free_c:
 	kfree(c);
 err_remove_ida:
-	ida_simple_remove(&comp.minor_id, current_minor);
+	ida_free(&comp.minor_id, current_minor);
 	return retval;
 }
 
Signature · 1 line
~Randy
#2 lore raw

Le 27/05/2022 à 17:37, Randy Dunlap a écrit :

Quoted 11 lines · keliu
Quoted 4 lines

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

The Signed-off-by: needs a more complete name (unless that is your full name).

Do any of Christophe's comments apply here?

Hi,

This one looks fine. Thanks keliu.

Should I nitpick, there is an extra <space> in the commit description before the final "." :)

In fact, I'm sure of who can give a Reviewed-by: or Acked-by: tag. So up to now, I only comment in-line when I go through patches randomly picked on the linext-kernel ML.

I think it is mainly for maintainer, but if anyone can give them, I'll be glad to add them if it helps in the process.

CJ

Quoted 89 lines

thanks.

Quoted 85 lines
---
  drivers/most/core.c      | 10 +++++-----
  drivers/most/most_cdev.c |  6 +++---
  2 files changed, 8 insertions(+), 8 deletions(-)
drivers/most/core.c +5 -5
index e4412c7d25b0..81d60d4ee8c2 100644
@@ -1286,7 +1286,7 @@ int most_register_interface(struct most_interface *iface)
  	    !iface->poison_channel || (iface->num_channels > MAX_CHANNELS))
  		return -EINVAL;
 
-	id = ida_simple_get(&mdev_id, 0, 0, GFP_KERNEL);
+	id = ida_alloc(&mdev_id, GFP_KERNEL);
  	if (id < 0) {
  		dev_err(iface->dev, "Failed to allocate device ID\n");
  		return id;
@@ -1294,7 +1294,7 @@ int most_register_interface(struct most_interface *iface)
 
  	iface->p = kzalloc(sizeof(*iface->p), GFP_KERNEL);
  	if (!iface->p) {
-		ida_simple_remove(&mdev_id, id);
+		ida_free(&mdev_id, id);
  		return -ENOMEM;
  	}
 
@@ -1308,7 +1308,7 @@ int most_register_interface(struct most_interface *iface)
  		dev_err(iface->dev, "Failed to register interface device\n");
  		kfree(iface->p);
  		put_device(iface->dev);
-		ida_simple_remove(&mdev_id, id);
+		ida_free(&mdev_id, id);
  		return -ENOMEM;
  	}
 
@@ -1366,7 +1366,7 @@ int most_register_interface(struct most_interface *iface)
  	}
  	kfree(iface->p);
  	device_unregister(iface->dev);
-	ida_simple_remove(&mdev_id, id);
+	ida_free(&mdev_id, id);
  	return -ENOMEM;
  }
  EXPORT_SYMBOL_GPL(most_register_interface);
@@ -1397,7 +1397,7 @@ void most_deregister_interface(struct most_interface *iface)
  		device_unregister(&c->dev);
  	}
 
-	ida_simple_remove(&mdev_id, iface->p->dev_id);
+	ida_free(&mdev_id, iface->p->dev_id);
  	kfree(iface->p);
  	device_unregister(iface->dev);
  }
drivers/most/most_cdev.c +3 -3
index 3722f9abd7b9..27913b1c8128 100644
@@ -100,7 +100,7 @@ static void destroy_cdev(struct comp_channel *c)
 
  static void destroy_channel(struct comp_channel *c)
  {
-	ida_simple_remove(&comp.minor_id, MINOR(c->devno));
+	ida_free(&comp.minor_id, MINOR(c->devno));
  	kfifo_free(&c->fifo);
  	kfree(c);
  }
@@ -424,7 +424,7 @@ static int comp_probe(struct most_interface *iface, int channel_id,
  	if (c)
  		return -EEXIST;
 
-	current_minor = ida_simple_get(&comp.minor_id, 0, 0, GFP_KERNEL);
+	current_minor = ida_alloc(&comp.minor_id, GFP_KERNEL);
  	if (current_minor < 0)
  		return current_minor;
 
@@ -471,7 +471,7 @@ static int comp_probe(struct most_interface *iface, int channel_id,
  err_free_c:
  	kfree(c);
  err_remove_ida:
-	ida_simple_remove(&comp.minor_id, current_minor);
+	ida_free(&comp.minor_id, current_minor);
  	return retval;
  }
 
#3 lore raw

Le 27/05/2022 à 18:50, Christophe JAILLET a écrit :

Quoted 13 lines

Le 27/05/2022 à 17:37, Randy Dunlap a écrit :

Quoted 11 lines · keliu
Quoted 4 lines

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

The Signed-off-by: needs a more complete name (unless that is your full name).

Do any of Christophe's comments apply here?

Quoted 8 lines

Hi,

This one looks fine. Thanks keliu.

Should I nitpick, there is an extra <space> in the commit description before the final "." :)

In fact, I'm sure of who can give a Reviewed-by: or Acked-by: tag. So up

Typo: read: ... I'm NOT sure ...

Quoted 96 lines

to now, I only comment in-line when I go through patches randomly picked on the linext-kernel ML.

I think it is mainly for maintainer, but if anyone can give them, I'll be glad to add them if it helps in the process.

CJ

Quoted 87 lines

thanks.

Quoted 83 lines

---
  drivers/most/core.c      | 10 +++++-----
  drivers/most/most_cdev.c |  6 +++---

  2 files changed, 8 insertions(+), 8 deletions(-)
drivers/most/core.c +4 -4
index e4412c7d25b0..81d60d4ee8c2 100644
@@ -1286,7 +1286,7 @@ int most_register_interface(struct 
 most_interface *iface)
           !iface->poison_channel || (iface->num_channels > MAX_CHANNELS))
           return -EINVAL;
-    id = ida_simple_get(&mdev_id, 0, 0, GFP_KERNEL);
+    id = ida_alloc(&mdev_id, GFP_KERNEL);
       if (id < 0) {
           dev_err(iface->dev, "Failed to allocate device ID\n");
           return id;
@@ -1294,7 +1294,7 @@ int most_register_interface(struct 
 most_interface *iface)
       iface->p = kzalloc(sizeof(*iface->p), GFP_KERNEL);
       if (!iface->p) {
-        ida_simple_remove(&mdev_id, id);
+        ida_free(&mdev_id, id);
           return -ENOMEM;
       }
@@ -1308,7 +1308,7 @@ int most_register_interface(struct 
 most_interface *iface)
           dev_err(iface->dev, "Failed to register interface device\n");
           kfree(iface->p);
           put_device(iface->dev);
-        ida_simple_remove(&mdev_id, id);
+        ida_free(&mdev_id, id);
           return -ENOMEM;
       }
@@ -1366,7 +1366,7 @@ int most_register_interface(struct 
 most_interface *iface)
       }
       kfree(iface->p);
       device_unregister(iface->dev);
-    ida_simple_remove(&mdev_id, id);
+    ida_free(&mdev_id, id);
       return -ENOMEM;
   }

  EXPORT_SYMBOL_GPL(most_register_interface);

drivers/most/core.c +1 -1
@@ -1397,7 +1397,7 @@ void most_deregister_interface(struct 
 most_interface *iface)
           device_unregister(&c->dev);
       }
-    ida_simple_remove(&mdev_id, iface->p->dev_id);
+    ida_free(&mdev_id, iface->p->dev_id);
       kfree(iface->p);
       device_unregister(iface->dev);
   }
drivers/most/most_cdev.c +2 -2
index 3722f9abd7b9..27913b1c8128 100644
@@ -100,7 +100,7 @@ static void destroy_cdev(struct comp_channel *c)
   static void destroy_channel(struct comp_channel *c)
   {
-    ida_simple_remove(&comp.minor_id, MINOR(c->devno));
+    ida_free(&comp.minor_id, MINOR(c->devno));
       kfifo_free(&c->fifo);
       kfree(c);
   }
@@ -424,7 +424,7 @@ static int comp_probe(struct most_interface 
 *iface, int channel_id,
       if (c)
           return -EEXIST;
-    current_minor = ida_simple_get(&comp.minor_id, 0, 0, GFP_KERNEL);
+    current_minor = ida_alloc(&comp.minor_id, GFP_KERNEL);
       if (current_minor < 0)
           return current_minor;
@@ -471,7 +471,7 @@ static int comp_probe(struct most_interface 
 *iface, int channel_id,

  err_free_c:
      kfree(c);
  err_remove_ida:
-    ida_simple_remove(&comp.minor_id, current_minor); +    ida_free(&comp.minor_id, current_minor); return retval;
  }