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

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

+13 -10
+1 -1
drivers/rpmsg/rpmsg_char.c
··· 423 423 init_waitqueue_head(&eptdev->readq); 424 424 425 425 device_initialize(dev); 426 - dev->class = rpmsg_class; 426 + dev->class = &rpmsg_class; 427 427 dev->parent = parent; 428 428 dev->groups = rpmsg_eptdev_groups; 429 429 dev_set_drvdata(dev, eptdev);
+9 -7
drivers/rpmsg/rpmsg_core.c
··· 20 20 21 21 #include "rpmsg_internal.h" 22 22 23 - struct class *rpmsg_class; 23 + const struct class rpmsg_class = { 24 + .name = "rpmsg", 25 + }; 24 26 EXPORT_SYMBOL(rpmsg_class); 25 27 26 28 /** ··· 717 715 { 718 716 int ret; 719 717 720 - rpmsg_class = class_create("rpmsg"); 721 - if (IS_ERR(rpmsg_class)) { 722 - pr_err("failed to create rpmsg class\n"); 723 - return PTR_ERR(rpmsg_class); 718 + ret = class_register(&rpmsg_class); 719 + if (ret) { 720 + pr_err("failed to register rpmsg class\n"); 721 + return ret; 724 722 } 725 723 726 724 ret = bus_register(&rpmsg_bus); 727 725 if (ret) { 728 726 pr_err("failed to register rpmsg bus: %d\n", ret); 729 - class_destroy(rpmsg_class); 727 + class_destroy(&rpmsg_class); 730 728 } 731 729 return ret; 732 730 } ··· 735 733 static void __exit rpmsg_fini(void) 736 734 { 737 735 bus_unregister(&rpmsg_bus); 738 - class_destroy(rpmsg_class); 736 + class_destroy(&rpmsg_class); 739 737 } 740 738 module_exit(rpmsg_fini); 741 739
+1 -1
drivers/rpmsg/rpmsg_ctrl.c
··· 150 150 dev = &ctrldev->dev; 151 151 device_initialize(dev); 152 152 dev->parent = &rpdev->dev; 153 - dev->class = rpmsg_class; 153 + dev->class = &rpmsg_class; 154 154 155 155 mutex_init(&ctrldev->ctrl_lock); 156 156 cdev_init(&ctrldev->cdev, &rpmsg_ctrldev_fops);
+1 -1
drivers/rpmsg/rpmsg_internal.h
··· 18 18 #define to_rpmsg_device(d) container_of(d, struct rpmsg_device, dev) 19 19 #define to_rpmsg_driver(d) container_of(d, struct rpmsg_driver, drv) 20 20 21 - extern struct class *rpmsg_class; 21 + extern const struct class rpmsg_class; 22 22 23 23 /** 24 24 * struct rpmsg_device_ops - indirection table for the rpmsg_device operations