staging: most: rename struct core_component

The stuctures defined in the most.h header file will be exposed to the
kernel once the file is moved out of the staging area. That's why the name
is changed into something more descriptive.

Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Link: https://lore.kernel.org/r/1576238662-16512-3-git-send-email-christian.gromm@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/most/cdev/cdev.c b/drivers/staging/most/cdev/cdev.c
index df4cb5a3818edc40c2b30ef71ffd215270cd9db3..9ce2f23dcaed3439e4d9e0233224965dfaf472cc 100644 (file)
--- a/drivers/staging/most/cdev/cdev.c
+++ b/drivers/staging/most/cdev/cdev.c
@@ -25,7 +25,7 @@ static struct cdev_component {
        struct ida minor_id;
        unsigned int major;
        struct class *class;
-       struct core_component cc;
+       struct most_component cc;
 } comp;
 
 struct comp_channel {

diff --git a/drivers/staging/most/configfs.c b/drivers/staging/most/configfs.c
index e17d8461a916b29614b4d81b983a074c9eaa19e7..d67102229afece5517ffd04fd64eab63f3606eef 100644 (file)
--- a/drivers/staging/most/configfs.c
+++ b/drivers/staging/most/configfs.c
@@ -630,7 +630,7 @@ static struct most_sound most_sound_subsys = {
        },
 };
 
-int most_register_configfs_subsys(struct core_component *c)
+int most_register_configfs_subsys(struct most_component *c)
 {
        int ret;
 
@@ -674,7 +674,7 @@ void most_interface_register_notify(const char *mdev)
                most_cfg_complete("sound");
 }
 
-void most_deregister_configfs_subsys(struct core_component *c)
+void most_deregister_configfs_subsys(struct most_component *c)
 {
        if (!strcmp(c->name, "cdev"))
                configfs_unregister_subsystem(&most_cdev.subsys);

diff --git a/drivers/staging/most/core.c b/drivers/staging/most/core.c
index e32030c38255b1e25c8da6db1359b8dd20c6caa7..af542ed6c7f0213541bef09adb738a488d6dc979 100644 (file)
--- a/drivers/staging/most/core.c
+++ b/drivers/staging/most/core.c
@@ -39,7 +39,7 @@ static struct mostcore {
 #define to_driver(d) container_of(d, struct mostcore, drv)
 
 struct pipe {
-       struct core_component *comp;
+       struct most_component *comp;
        int refs;
        int num_buffers;
 };
@@ -454,9 +454,9 @@ static const struct attribute_group *interface_attr_groups[] = {
        NULL,
 };
 
-static struct core_component *match_component(char *name)
+static struct most_component *match_component(char *name)
 {
-       struct core_component *comp;
+       struct most_component *comp;
 
        list_for_each_entry(comp, &mc.comp_list, list) {
                if (!strcmp(comp->name, name))
@@ -510,7 +510,7 @@ static ssize_t links_show(struct device_driver *drv, char *buf)
 
 static ssize_t components_show(struct device_driver *drv, char *buf)
 {
-       struct core_component *comp;
+       struct most_component *comp;
        int offs = 0;
 
        list_for_each_entry(comp, &mc.comp_list, list) {
@@ -544,12 +544,12 @@ static struct most_channel *get_channel(char *mdev, char *mdev_ch)
 
 static
 inline int link_channel_to_component(struct most_channel *c,
-                                    struct core_component *comp,
+                                    struct most_component *comp,
                                     char *name,
                                     char *comp_param)
 {
        int ret;
-       struct core_component **comp_ptr;
+       struct most_component **comp_ptr;
 
        if (!c->pipe0.comp)
                comp_ptr = &c->pipe0.comp;
@@ -660,7 +660,7 @@ int most_set_cfg_packets_xact(char *mdev, char *mdev_ch, u16 val)
 
 int most_cfg_complete(char *comp_name)
 {
-       struct core_component *comp;
+       struct most_component *comp;
 
        comp = match_component(comp_name);
        if (!comp)
@@ -673,7 +673,7 @@ int most_add_link(char *mdev, char *mdev_ch, char *comp_name, char *link_name,
                  char *comp_param)
 {
        struct most_channel *c = get_channel(mdev, mdev_ch);
-       struct core_component *comp = match_component(comp_name);
+       struct most_component *comp = match_component(comp_name);
 
        if (!c || !comp)
                return -ENODEV;
@@ -684,7 +684,7 @@ int most_add_link(char *mdev, char *mdev_ch, char *comp_name, char *link_name,
 int most_remove_link(char *mdev, char *mdev_ch, char *comp_name)
 {
        struct most_channel *c;
-       struct core_component *comp;
+       struct most_component *comp;
 
        comp = match_component(comp_name);
        if (!comp)
@@ -950,7 +950,7 @@ static void most_write_completion(struct mbo *mbo)
 }
 
 int channel_has_mbo(struct most_interface *iface, int id,
-                   struct core_component *comp)
+                   struct most_component *comp)
 {
        struct most_channel *c = iface->p->channel[id];
        unsigned long flags;
@@ -981,7 +981,7 @@ EXPORT_SYMBOL_GPL(channel_has_mbo);
  * Returns a pointer to MBO on success or NULL otherwise.
  */
 struct mbo *most_get_mbo(struct most_interface *iface, int id,
-                        struct core_component *comp)
+                        struct most_component *comp)
 {
        struct mbo *mbo;
        struct most_channel *c;
@@ -1087,7 +1087,7 @@ static void most_read_completion(struct mbo *mbo)
  * Returns 0 on success or error code otherwise.
  */
 int most_start_channel(struct most_interface *iface, int id,
-                      struct core_component *comp)
+                      struct most_component *comp)
 {
        int num_buffer;
        int ret;
@@ -1157,7 +1157,7 @@ EXPORT_SYMBOL_GPL(most_start_channel);
  * @comp: driver component
  */
 int most_stop_channel(struct most_interface *iface, int id,
-                     struct core_component *comp)
+                     struct most_component *comp)
 {
        struct most_channel *c;
 
@@ -1215,7 +1215,7 @@ EXPORT_SYMBOL_GPL(most_stop_channel);
  * most_register_component - registers a driver component with the core
  * @comp: driver component
  */
-int most_register_component(struct core_component *comp)
+int most_register_component(struct most_component *comp)
 {
        if (!comp) {
                pr_err("Bad component\n");
@@ -1231,7 +1231,7 @@ static int disconnect_channels(struct device *dev, void *data)
 {
        struct most_interface *iface;
        struct most_channel *c, *tmp;
-       struct core_component *comp = data;
+       struct most_component *comp = data;
 
        iface = to_most_interface(dev);
        list_for_each_entry_safe(c, tmp, &iface->p->channel_list, list) {
@@ -1249,7 +1249,7 @@ static int disconnect_channels(struct device *dev, void *data)
  * most_deregister_component - deregisters a driver component with the core
  * @comp: driver component
  */
-int most_deregister_component(struct core_component *comp)
+int most_deregister_component(struct most_component *comp)
 {
        if (!comp) {
                pr_err("Bad component\n");

diff --git a/drivers/staging/most/most.h b/drivers/staging/most/most.h
index 1380e7586376e5032d1c9eb8a184e1fa9efd8cc6..fa6b29fb32f73b45dd120282af0b7314ea642ebd 100644 (file)
--- a/drivers/staging/most/most.h
+++ b/drivers/staging/most/most.h
@@ -254,7 +254,7 @@ struct most_interface {
 #define to_most_interface(d) container_of(d, struct most_interface, dev)
 
 /**
- * struct core_component - identifies a loadable component for the mostcore
+ * struct most_component - identifies a loadable component for the mostcore
  * @list: list_head
  * @name: component name
  * @probe_channel: function for core to notify driver about channel connection
@@ -262,7 +262,7 @@ struct most_interface {
  * @rx_completion: completion handler for received packets
  * @tx_completion: completion handler for transmitted packets
  */
-struct core_component {
+struct most_component {
        struct list_head list;
        const char *name;
        struct module *mod;
@@ -310,20 +310,20 @@ 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_component(struct core_component *comp);
-int most_deregister_component(struct core_component *comp);
+int most_register_component(struct most_component *comp);
+int most_deregister_component(struct most_component *comp);
 struct mbo *most_get_mbo(struct most_interface *iface, int channel_idx,
-                        struct core_component *comp);
+                        struct most_component *comp);
 void most_put_mbo(struct mbo *mbo);
 int channel_has_mbo(struct most_interface *iface, int channel_idx,
-                   struct core_component *comp);
+                   struct most_component *comp);
 int most_start_channel(struct most_interface *iface, int channel_idx,
-                      struct core_component *comp);
+                      struct most_component *comp);
 int most_stop_channel(struct most_interface *iface, int channel_idx,
-                     struct core_component *comp);
+                     struct most_component *comp);
 int __init configfs_init(void);
-int most_register_configfs_subsys(struct core_component *comp);
-void most_deregister_configfs_subsys(struct core_component *comp);
+int most_register_configfs_subsys(struct most_component *comp);
+void most_deregister_configfs_subsys(struct most_component *comp);
 int most_add_link(char *mdev, char *mdev_ch, char *comp_name, char *link_name,
                  char *comp_param);
 int most_remove_link(char *mdev, char *mdev_ch, char *comp_name);

diff --git a/drivers/staging/most/net/net.c b/drivers/staging/most/net/net.c
index 34d93c47a70b6655dc7e7efb79c6ae68ed358e2a..e3dd33701a15961b7a3d2d2de124b421e57d70d0 100644 (file)
--- a/drivers/staging/most/net/net.c
+++ b/drivers/staging/most/net/net.c
@@ -70,7 +70,7 @@ struct net_dev_context {
 static struct list_head net_devices = LIST_HEAD_INIT(net_devices);
 static struct mutex probe_disc_mt; /* ch->linked = true, most_nd_open */
 static DEFINE_SPINLOCK(list_lock); /* list_head, ch->linked = false, dev_hold */
-static struct core_component comp;
+static struct most_component comp;
 
 static int skb_to_mamac(const struct sk_buff *skb, struct mbo *mbo)
 {
@@ -497,7 +497,7 @@ static int comp_rx_data(struct mbo *mbo)
        return ret;
 }
 
-static struct core_component comp = {
+static struct most_component comp = {
        .mod = THIS_MODULE,
        .name = "net",
        .probe_channel = comp_probe_channel,

diff --git a/drivers/staging/most/sound/sound.c b/drivers/staging/most/sound/sound.c
index 38642b2be306339679f3915ba32ce8b5abd09358..23baf4bd7c120ea456a6cc0ed4ce1b455c7a77a4 100644 (file)
--- a/drivers/staging/most/sound/sound.c
+++ b/drivers/staging/most/sound/sound.c
@@ -22,7 +22,7 @@
 #define DRIVER_NAME "sound"
 #define STRING_SIZE    80
 
-static struct core_component comp;
+static struct most_component comp;
 
 /**
  * struct channel - private structure to keep channel specific data
@@ -736,9 +736,9 @@ static int audio_tx_completion(struct most_interface *iface, int channel_id)
 }
 
 /**
- * Initialization of the struct core_component
+ * Initialization of the struct most_component
  */
-static struct core_component comp = {
+static struct most_component comp = {
        .mod = THIS_MODULE,
        .name = DRIVER_NAME,
        .probe_channel = audio_probe_channel,

diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c
index b75ccc86e178d3126f8608fba727ed374742ccf9..0f45b042486cbf1751f0bc71303973f00471f229 100644 (file)
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@ -25,7 +25,7 @@
 
 #define V4L2_CMP_MAX_INPUT  1
 
-static struct core_component comp;
+static struct most_component comp;
 
 struct most_video_dev {
        struct most_interface *iface;
@@ -527,7 +527,7 @@ static int comp_disconnect_channel(struct most_interface *iface,
        return 0;
 }
 
-static struct core_component comp = {
+static struct most_component comp = {
        .mod = THIS_MODULE,
        .name = "video",
        .probe_channel = comp_probe_channel,