Commit e66128fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull rpmsg updates from Bjorn Andersson:
 "This makes core rpmsg_class const and ensures that the automatic
  module loading of the Qualcomm glink_ssr driver happens"

* tag 'rpmsg-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  rpmsg: qcom_glink_ssr: fix module autoloading
  rpmsg: core: Make rpmsg_class constant
parents f0bae243 bcbab579

drivers/rpmsg/qcom_glink_ssr.c

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static const struct rpmsg_device_id qcom_glink_ssr_match[] = { 
	{ "glink_ssr" },

	{}

};

MODULE_DEVICE_TABLE(rpmsg, qcom_glink_ssr_match);



static struct rpmsg_driver qcom_glink_ssr_driver = {

	.probe = qcom_glink_ssr_probe,

drivers/rpmsg/rpmsg_char.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev 
	init_waitqueue_head(&eptdev->readq);



	device_initialize(dev);

	dev->class = rpmsg_class;

	dev->class = &rpmsg_class;

	dev->parent = parent;

	dev->groups = rpmsg_eptdev_groups;

	dev_set_drvdata(dev, eptdev);

drivers/rpmsg/rpmsg_core.c

+9 −7
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ 


#include "rpmsg_internal.h"



struct class *rpmsg_class;

const struct class rpmsg_class = {

	.name = "rpmsg",

};

EXPORT_SYMBOL(rpmsg_class);



/**
@@ -715,16 +717,16 @@ static int __init rpmsg_init(void) 
{

	int ret;



	rpmsg_class = class_create("rpmsg");

	if (IS_ERR(rpmsg_class)) {

		pr_err("failed to create rpmsg class\n");

		return PTR_ERR(rpmsg_class);

	ret = class_register(&rpmsg_class);

	if (ret) {

		pr_err("failed to register rpmsg class\n");

		return ret;

	}



	ret = bus_register(&rpmsg_bus);

	if (ret) {

		pr_err("failed to register rpmsg bus: %d\n", ret);

		class_destroy(rpmsg_class);

		class_destroy(&rpmsg_class);

	}

	return ret;

}
@@ -733,7 +735,7 @@ postcore_initcall(rpmsg_init); 
static void __exit rpmsg_fini(void)

{

	bus_unregister(&rpmsg_bus);

	class_destroy(rpmsg_class);

	class_destroy(&rpmsg_class);

}

module_exit(rpmsg_fini);

drivers/rpmsg/rpmsg_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int rpmsg_ctrldev_probe(struct rpmsg_device *rpdev) 
	dev = &ctrldev->dev;

	device_initialize(dev);

	dev->parent = &rpdev->dev;

	dev->class = rpmsg_class;

	dev->class = &rpmsg_class;



	mutex_init(&ctrldev->ctrl_lock);

	cdev_init(&ctrldev->cdev, &rpmsg_ctrldev_fops);

drivers/rpmsg/rpmsg_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define to_rpmsg_device(d) container_of(d, struct rpmsg_device, dev)

#define to_rpmsg_driver(d) container_of(d, struct rpmsg_driver, drv)



extern struct class *rpmsg_class;

extern const struct class rpmsg_class;



/**

 * struct rpmsg_device_ops - indirection table for the rpmsg_device operations