Commit 91f263dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0e875ee5 b03aa6d4

drivers/rpmsg/rpmsg_char.c

+6 −6
Original line number Diff line number Diff line
@@ -399,8 +399,8 @@ static void rpmsg_eptdev_release_device(struct device *dev) 
{

	struct rpmsg_eptdev *eptdev = dev_to_eptdev(dev);



	ida_simple_remove(&rpmsg_ept_ida, dev->id);

	ida_simple_remove(&rpmsg_minor_ida, MINOR(eptdev->dev.devt));

	ida_free(&rpmsg_ept_ida, dev->id);

	ida_free(&rpmsg_minor_ida, MINOR(eptdev->dev.devt));

	kfree(eptdev);

}
@@ -441,12 +441,12 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha 


	eptdev->chinfo = chinfo;



	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_eptdev;

	dev->devt = MKDEV(MAJOR(rpmsg_major), ret);



	ret = ida_simple_get(&rpmsg_ept_ida, 0, 0, GFP_KERNEL);

	ret = ida_alloc(&rpmsg_ept_ida, GFP_KERNEL);

	if (ret < 0)

		goto free_minor_ida;

	dev->id = ret;
@@ -462,9 +462,9 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha 
	return ret;



free_ept_ida:

	ida_simple_remove(&rpmsg_ept_ida, dev->id);

	ida_free(&rpmsg_ept_ida, dev->id);

free_minor_ida:

	ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt));

	ida_free(&rpmsg_minor_ida, MINOR(dev->devt));

free_eptdev:

	put_device(dev);

	kfree(eptdev);

drivers/rpmsg/rpmsg_core.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static void rpmsg_dev_remove(struct device *dev) 
		rpmsg_destroy_ept(rpdev->ept);

}



static struct bus_type rpmsg_bus = {

static const struct bus_type rpmsg_bus = {

	.name		= "rpmsg",

	.match		= rpmsg_dev_match,

	.dev_groups	= rpmsg_dev_groups,

drivers/rpmsg/rpmsg_ctrl.c

+6 −6
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ static void rpmsg_ctrldev_release_device(struct device *dev) 
{

	struct rpmsg_ctrldev *ctrldev = dev_to_ctrldev(dev);



	ida_simple_remove(&rpmsg_ctrl_ida, dev->id);

	ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt));

	ida_free(&rpmsg_ctrl_ida, dev->id);

	ida_free(&rpmsg_minor_ida, MINOR(dev->devt));

	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;



	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);



	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;
@@ -179,9 +179,9 @@ static int rpmsg_ctrldev_probe(struct rpmsg_device *rpdev) 
	return ret;



free_ctrl_ida:

	ida_simple_remove(&rpmsg_ctrl_ida, dev->id);

	ida_free(&rpmsg_ctrl_ida, dev->id);

free_minor_ida:

	ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt));

	ida_free(&rpmsg_minor_ida, MINOR(dev->devt));

free_ctrldev:

	put_device(dev);

	kfree(ctrldev);