Merge tag 'char-misc-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[linux-2.6-microblaze.git] / drivers / most / most_cdev.c

diff --git a/drivers/most/most_cdev.c b/drivers/most/most_cdev.c
index 0448807..8908b93 100644 (file)
--- a/drivers/most/most_cdev.c
+++ b/drivers/most/most_cdev.c
@@ -44,8 +44,8 @@ struct comp_channel {
 };
 
 #define to_channel(d) container_of(d, struct comp_channel, cdev)
-static struct list_head channel_list;
-static spinlock_t ch_list_lock;
+static LIST_HEAD(channel_list);
+static DEFINE_SPINLOCK(ch_list_lock);
 
 static inline bool ch_has_mbo(struct comp_channel *c)
 {
@@ -494,8 +494,6 @@ static int __init mod_init(void)
        if (IS_ERR(comp.class))
                return PTR_ERR(comp.class);
 
-       INIT_LIST_HEAD(&channel_list);
-       spin_lock_init(&ch_list_lock);
        ida_init(&comp.minor_id);
 
        err = alloc_chrdev_region(&comp.devno, 0, CHRDEV_REGION_SIZE, "cdev");