tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'rpmsg-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux

Pull rpmsg updates from Bjorn Andersson:
"This transitions rpmsg_ctrl and rpmsg_char drivers away from the
deprecated ida_simple_*() API. It also makes the rpmsg_bus const"

* tag 'rpmsg-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
rpmsg: core: Make rpmsg_bus const
rpmsg: Remove usage of the deprecated ida_simple_xx() API

Linus Torvalds 91f263dd 0e875ee5

+13 -13
+6 -6
drivers/rpmsg/rpmsg_char.c
··· 399 399 { 400 400 struct rpmsg_eptdev *eptdev = dev_to_eptdev(dev); 401 401 402 - ida_simple_remove(&rpmsg_ept_ida, dev->id); 403 - ida_simple_remove(&rpmsg_minor_ida, MINOR(eptdev->dev.devt)); 402 + ida_free(&rpmsg_ept_ida, dev->id); 403 + ida_free(&rpmsg_minor_ida, MINOR(eptdev->dev.devt)); 404 404 kfree(eptdev); 405 405 } 406 406 ··· 441 441 442 442 eptdev->chinfo = chinfo; 443 443 444 - ret = ida_simple_get(&rpmsg_minor_ida, 0, RPMSG_DEV_MAX, GFP_KERNEL); 444 + ret = ida_alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1, GFP_KERNEL); 445 445 if (ret < 0) 446 446 goto free_eptdev; 447 447 dev->devt = MKDEV(MAJOR(rpmsg_major), ret); 448 448 449 - ret = ida_simple_get(&rpmsg_ept_ida, 0, 0, GFP_KERNEL); 449 + ret = ida_alloc(&rpmsg_ept_ida, GFP_KERNEL); 450 450 if (ret < 0) 451 451 goto free_minor_ida; 452 452 dev->id = ret; ··· 462 462 return ret; 463 463 464 464 free_ept_ida: 465 - ida_simple_remove(&rpmsg_ept_ida, dev->id); 465 + ida_free(&rpmsg_ept_ida, dev->id); 466 466 free_minor_ida: 467 - ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt)); 467 + ida_free(&rpmsg_minor_ida, MINOR(dev->devt)); 468 468 free_eptdev: 469 469 put_device(dev); 470 470 kfree(eptdev);
+1 -1
drivers/rpmsg/rpmsg_core.c
··· 605 605 rpmsg_destroy_ept(rpdev->ept); 606 606 } 607 607 608 - static struct bus_type rpmsg_bus = { 608 + static const struct bus_type rpmsg_bus = { 609 609 .name = "rpmsg", 610 610 .match = rpmsg_dev_match, 611 611 .dev_groups = rpmsg_dev_groups,
+6 -6
drivers/rpmsg/rpmsg_ctrl.c
··· 130 130 { 131 131 struct rpmsg_ctrldev *ctrldev = dev_to_ctrldev(dev); 132 132 133 - ida_simple_remove(&rpmsg_ctrl_ida, dev->id); 134 - ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt)); 133 + ida_free(&rpmsg_ctrl_ida, dev->id); 134 + ida_free(&rpmsg_minor_ida, MINOR(dev->devt)); 135 135 kfree(ctrldev); 136 136 } 137 137 ··· 156 156 cdev_init(&ctrldev->cdev, &rpmsg_ctrldev_fops); 157 157 ctrldev->cdev.owner = THIS_MODULE; 158 158 159 - ret = ida_simple_get(&rpmsg_minor_ida, 0, RPMSG_DEV_MAX, GFP_KERNEL); 159 + ret = ida_alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1, GFP_KERNEL); 160 160 if (ret < 0) 161 161 goto free_ctrldev; 162 162 dev->devt = MKDEV(MAJOR(rpmsg_major), ret); 163 163 164 - ret = ida_simple_get(&rpmsg_ctrl_ida, 0, 0, GFP_KERNEL); 164 + ret = ida_alloc(&rpmsg_ctrl_ida, GFP_KERNEL); 165 165 if (ret < 0) 166 166 goto free_minor_ida; 167 167 dev->id = ret; ··· 179 179 return ret; 180 180 181 181 free_ctrl_ida: 182 - ida_simple_remove(&rpmsg_ctrl_ida, dev->id); 182 + ida_free(&rpmsg_ctrl_ida, dev->id); 183 183 free_minor_ida: 184 - ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt)); 184 + ida_free(&rpmsg_minor_ida, MINOR(dev->devt)); 185 185 free_ctrldev: 186 186 put_device(dev); 187 187 kfree(ctrldev);