From ed021a0f8e5b1ac2966a997e908c6a7824da6baa Mon Sep 17 00:00:00 2001 From: Christian Gromm Date: Tue, 21 Nov 2017 15:05:01 +0100 Subject: staging: most: rename functions to register a driver with most_core This patch renames the functions to register and deregister a component module with the core. It is needed because the modules that interface the userspace are referred to as components. Signed-off-by: Christian Gromm Signed-off-by: Greg Kroah-Hartman --- drivers/staging/most/cdev/cdev.c | 4 ++-- drivers/staging/most/core.c | 13 +++++++------ drivers/staging/most/core.h | 4 ++-- drivers/staging/most/net/net.c | 4 ++-- drivers/staging/most/sound/sound.c | 4 ++-- drivers/staging/most/video/video.c | 6 +++--- 6 files changed, 18 insertions(+), 17 deletions(-) (limited to 'drivers/staging/most') diff --git a/drivers/staging/most/cdev/cdev.c b/drivers/staging/most/cdev/cdev.c index a45a4dcbeb9b..2447fbfd201e 100644 --- a/drivers/staging/most/cdev/cdev.c +++ b/drivers/staging/most/cdev/cdev.c @@ -518,7 +518,7 @@ static int __init mod_init(void) err = PTR_ERR(aim_class); goto free_cdev; } - err = most_register_aim(&cdev_aim); + err = most_register_component(&cdev_aim); if (err) goto dest_class; return 0; @@ -538,7 +538,7 @@ static void __exit mod_exit(void) pr_info("exit module\n"); - most_deregister_aim(&cdev_aim); + most_deregister_component(&cdev_aim); list_for_each_entry_safe(c, tmp, &channel_list, list) { destroy_cdev(c); diff --git a/drivers/staging/most/core.c b/drivers/staging/most/core.c index 520b851c5bf8..dd6cebf88e59 100644 --- a/drivers/staging/most/core.c +++ b/drivers/staging/most/core.c @@ -69,6 +69,7 @@ struct most_channel { struct list_head trash_fifo; struct task_struct *hdm_enqueue_task; wait_queue_head_t hdm_fifo_wq; + }; #define to_channel(d) container_of(d, struct most_channel, dev) @@ -1299,10 +1300,10 @@ out: EXPORT_SYMBOL_GPL(most_stop_channel); /** - * most_register_aim - registers an AIM (driver) with the core + * most_register_component - registers an AIM (driver) with the core * @aim: instance of AIM to be registered */ -int most_register_aim(struct core_component *aim) +int most_register_component(struct core_component *aim) { if (!aim) { pr_err("Bad driver\n"); @@ -1312,7 +1313,7 @@ int most_register_aim(struct core_component *aim) pr_info("registered new application interfacing module %s\n", aim->name); return 0; } -EXPORT_SYMBOL_GPL(most_register_aim); +EXPORT_SYMBOL_GPL(most_register_component); static int disconnect_channels(struct device *dev, void *data) { @@ -1333,10 +1334,10 @@ static int disconnect_channels(struct device *dev, void *data) } /** - * most_deregister_aim - deregisters an AIM (driver) with the core + * most_deregister_component - deregisters an AIM (driver) with the core * @aim: AIM to be removed */ -int most_deregister_aim(struct core_component *aim) +int most_deregister_component(struct core_component *aim) { if (!aim) { pr_err("Bad driver\n"); @@ -1348,7 +1349,7 @@ int most_deregister_aim(struct core_component *aim) pr_info("deregistering module %s\n", aim->name); return 0; } -EXPORT_SYMBOL_GPL(most_deregister_aim); +EXPORT_SYMBOL_GPL(most_deregister_component); static void release_interface(struct device *dev) { diff --git a/drivers/staging/most/core.h b/drivers/staging/most/core.h index 4b6e47e78ccf..5a3a5c5c3347 100644 --- a/drivers/staging/most/core.h +++ b/drivers/staging/most/core.h @@ -308,8 +308,8 @@ void most_stop_enqueue(struct most_interface *iface, int channel_idx); * in wait fifo. */ void most_resume_enqueue(struct most_interface *iface, int channel_idx); -int most_register_aim(struct core_component *comp); -int most_deregister_aim(struct core_component *comp); +int most_register_component(struct core_component *comp); +int most_deregister_component(struct core_component *comp); struct mbo *most_get_mbo(struct most_interface *iface, int channel_idx, struct core_component *comp); void most_put_mbo(struct mbo *mbo); diff --git a/drivers/staging/most/net/net.c b/drivers/staging/most/net/net.c index edc12ad4de61..cbe0dda011b4 100644 --- a/drivers/staging/most/net/net.c +++ b/drivers/staging/most/net/net.c @@ -506,12 +506,12 @@ static int __init most_net_init(void) { spin_lock_init(&list_lock); mutex_init(&probe_disc_mt); - return most_register_aim(&aim); + return most_register_component(&aim); } static void __exit most_net_exit(void) { - most_deregister_aim(&aim); + most_deregister_component(&aim); } /** diff --git a/drivers/staging/most/sound/sound.c b/drivers/staging/most/sound/sound.c index e605cbe57511..a3a46a269f43 100644 --- a/drivers/staging/most/sound/sound.c +++ b/drivers/staging/most/sound/sound.c @@ -733,7 +733,7 @@ static int __init audio_init(void) INIT_LIST_HEAD(&dev_list); - return most_register_aim(&audio_aim); + return most_register_component(&audio_aim); } static void __exit audio_exit(void) @@ -747,7 +747,7 @@ static void __exit audio_exit(void) snd_card_free(channel->card); } - most_deregister_aim(&audio_aim); + most_deregister_component(&audio_aim); } module_init(audio_init); diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c index 2b8b3aed1ec2..3a97a2443c0b 100644 --- a/drivers/staging/most/video/video.c +++ b/drivers/staging/most/video/video.c @@ -572,7 +572,7 @@ static struct core_component aim_info = { static int __init aim_init(void) { spin_lock_init(&list_lock); - return most_register_aim(&aim_info); + return most_register_component(&aim_info); } static void __exit aim_exit(void) @@ -581,7 +581,7 @@ static void __exit aim_exit(void) /* * As the mostcore currently doesn't call disconnect_channel() - * for linked channels while we call most_deregister_aim() + * for linked channels while we call most_deregister_component() * we simulate this call here. * This must be fixed in core. */ @@ -597,7 +597,7 @@ static void __exit aim_exit(void) } spin_unlock_irq(&list_lock); - most_deregister_aim(&aim_info); + most_deregister_component(&aim_info); BUG_ON(!list_empty(&video_devices)); } -- cgit v1.2.3