projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rpmsg: Remove usage of the deprecated ida_simple_xx() API
[linux-2.6-microblaze.git]
/
drivers
/
rpmsg
/
rpmsg_ctrl.c
diff --git
a/drivers/rpmsg/rpmsg_ctrl.c
b/drivers/rpmsg/rpmsg_ctrl.c
index
4332538
..
c312794
100644
(file)
--- a/
drivers/rpmsg/rpmsg_ctrl.c
+++ b/
drivers/rpmsg/rpmsg_ctrl.c
@@
-130,8
+130,8
@@
static void rpmsg_ctrldev_release_device(struct device *dev)
{
struct rpmsg_ctrldev *ctrldev = dev_to_ctrldev(dev);
{
struct rpmsg_ctrldev *ctrldev = dev_to_ctrldev(dev);
- ida_
simple_remov
e(&rpmsg_ctrl_ida, dev->id);
- ida_
simple_remov
e(&rpmsg_minor_ida, MINOR(dev->devt));
+ ida_
fre
e(&rpmsg_ctrl_ida, dev->id);
+ ida_
fre
e(&rpmsg_minor_ida, MINOR(dev->devt));
kfree(ctrldev);
}
kfree(ctrldev);
}
@@
-156,12
+156,12
@@
static int rpmsg_ctrldev_probe(struct rpmsg_device *rpdev)
cdev_init(&ctrldev->cdev, &rpmsg_ctrldev_fops);
ctrldev->cdev.owner = THIS_MODULE;
cdev_init(&ctrldev->cdev, &rpmsg_ctrldev_fops);
ctrldev->cdev.owner = THIS_MODULE;
- ret = ida_
simple_get(&rpmsg_minor_ida, 0, RPMSG_DEV_MAX
, GFP_KERNEL);
+ ret = ida_
alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1
, GFP_KERNEL);
if (ret < 0)
goto free_ctrldev;
dev->devt = MKDEV(MAJOR(rpmsg_major), ret);
if (ret < 0)
goto free_ctrldev;
dev->devt = MKDEV(MAJOR(rpmsg_major), ret);
- ret = ida_
simple_get(&rpmsg_ctrl_ida, 0, 0
, GFP_KERNEL);
+ ret = ida_
alloc(&rpmsg_ctrl_ida
, GFP_KERNEL);
if (ret < 0)
goto free_minor_ida;
dev->id = ret;
if (ret < 0)
goto free_minor_ida;
dev->id = ret;
@@
-179,9
+179,9
@@
static int rpmsg_ctrldev_probe(struct rpmsg_device *rpdev)
return ret;
free_ctrl_ida:
return ret;
free_ctrl_ida:
- ida_
simple_remov
e(&rpmsg_ctrl_ida, dev->id);
+ ida_
fre
e(&rpmsg_ctrl_ida, dev->id);
free_minor_ida:
free_minor_ida:
- ida_
simple_remov
e(&rpmsg_minor_ida, MINOR(dev->devt));
+ ida_
fre
e(&rpmsg_minor_ida, MINOR(dev->devt));
free_ctrldev:
put_device(dev);
kfree(ctrldev);
free_ctrldev:
put_device(dev);
kfree(ctrldev);