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 <christian.gromm@xxxxxxxxxxxxx>
---
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(-)
diff --git a/drivers/staging/most/cdev/cdev.c b/drivers/staging/most/cdev/cdev.c
index e1290b8..5f8f003 100644
--- a/drivers/staging/most/cdev/cdev.c
+++ b/drivers/staging/most/cdev/cdev.c
@@ -524,7 +524,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;
@@ -544,7 +544,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 fa1ed89d6..db453f2 100644
--- a/drivers/staging/most/core.c
+++ b/drivers/staging/most/core.c
@@ -75,6 +75,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)
@@ -1305,10 +1306,10 @@ int most_stop_channel(struct most_interface *iface, int id,
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");
@@ -1318,7 +1319,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)
{
@@ -1339,10 +1340,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");
@@ -1354,7 +1355,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 cfd5884..3c2975b 100644
--- a/drivers/staging/most/core.h
+++ b/drivers/staging/most/core.h
@@ -314,8 +314,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 b418436..a7c7c58 100644
--- a/drivers/staging/most/net/net.c
+++ b/drivers/staging/most/net/net.c
@@ -512,12 +512,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 2c13344..85bb024 100644
--- a/drivers/staging/most/sound/sound.c
+++ b/drivers/staging/most/sound/sound.c
@@ -739,7 +739,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)
@@ -753,7 +753,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 1a5af3c..34ffdab 100644
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@ -578,7 +578,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)
@@ -587,7 +587,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.
*/
@@ -603,7 +603,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));
}
--
2.7.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
