mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-28 16:53:49 +00:00
most: remove usage of the deprecated ida_simple_xx() API
ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove(). This is less verbose. Link: https://lkml.kernel.org/r/ddbb2e3f249ba90417dc7ab01713faa1091fb44c.1717855701.git.christophe.jaillet@wanadoo.fr Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by: Parthiban Veerasooran <parthiban.veerasooran@microchip.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: Alistar Popple <alistair@popple.id.au> Cc: Christian Gromm <christian.gromm@microchip.com> Cc: Eddie James <eajames@linux.ibm.com> Cc: Jeremy Kerr <jk@ozlabs.org> Cc: Joel Stanley <joel@jms.id.au> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
08ab091583
commit
b737a22170
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
@ -425,7 +425,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;
|
||||
|
||||
@ -472,7 +472,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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user