Commit ec5c00af authored by Christian Gromm's avatar Christian Gromm Committed by Greg Kroah-Hartman

staging: most: change structure initialization

By applying this patch the initialization of the most_aim structure is
performed at compile time.
Signed-off-by: default avatarAndrey Shvetsov <andrey.shvetsov@k2l.de>
Signed-off-by: default avatarChristian Gromm <christian.gromm@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cfe8c14
...@@ -79,7 +79,6 @@ struct net_dev_context { ...@@ -79,7 +79,6 @@ struct net_dev_context {
static struct list_head net_devices = LIST_HEAD_INIT(net_devices); static struct list_head net_devices = LIST_HEAD_INIT(net_devices);
static struct spinlock list_lock; static struct spinlock list_lock;
static struct most_aim aim;
static int skb_to_mamac(const struct sk_buff *skb, struct mbo *mbo) static int skb_to_mamac(const struct sk_buff *skb, struct mbo *mbo)
...@@ -491,15 +490,18 @@ static int aim_rx_data(struct mbo *mbo) ...@@ -491,15 +490,18 @@ static int aim_rx_data(struct mbo *mbo)
return 0; return 0;
} }
static struct most_aim aim = {
.name = "networking",
.probe_channel = aim_probe_channel,
.disconnect_channel = aim_disconnect_channel,
.tx_completion = aim_resume_tx_channel,
.rx_completion = aim_rx_data,
};
static int __init most_net_init(void) static int __init most_net_init(void)
{ {
pr_info("most_net_init()\n"); pr_info("most_net_init()\n");
spin_lock_init(&list_lock); spin_lock_init(&list_lock);
aim.name = "networking";
aim.probe_channel = aim_probe_channel;
aim.disconnect_channel = aim_disconnect_channel;
aim.tx_completion = aim_resume_tx_channel;
aim.rx_completion = aim_rx_data;
return most_register_aim(&aim); return most_register_aim(&aim);
} }
......
...@@ -62,7 +62,6 @@ struct aim_fh { ...@@ -62,7 +62,6 @@ struct aim_fh {
static struct list_head video_devices = LIST_HEAD_INIT(video_devices); static struct list_head video_devices = LIST_HEAD_INIT(video_devices);
static struct spinlock list_lock; static struct spinlock list_lock;
static struct most_aim aim_info;
static inline bool data_ready(struct most_video_dev *mdev) static inline bool data_ready(struct most_video_dev *mdev)
...@@ -590,14 +589,16 @@ static int aim_disconnect_channel(struct most_interface *iface, ...@@ -590,14 +589,16 @@ static int aim_disconnect_channel(struct most_interface *iface,
return 0; return 0;
} }
static struct most_aim aim_info = {
.name = "v4l",
.probe_channel = aim_probe_channel,
.disconnect_channel = aim_disconnect_channel,
.rx_completion = aim_rx_data,
};
static int __init aim_init(void) static int __init aim_init(void)
{ {
spin_lock_init(&list_lock); spin_lock_init(&list_lock);
aim_info.name = "v4l";
aim_info.probe_channel = aim_probe_channel;
aim_info.disconnect_channel = aim_disconnect_channel;
aim_info.rx_completion = aim_rx_data;
return most_register_aim(&aim_info); return most_register_aim(&aim_info);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment