greybus: connection: Save major/minor supported by module

[karo-tx-linux.git] / drivers / staging / greybus / connection.h

diff --git a/drivers/staging/greybus/connection.h b/drivers/staging/greybus/connection.h
index 5c3fad3f46eb79d73e8cf253bac951679178ec10..0dbbc202e9539087bb1e0b0630bfda496755f1aa 100644 (file)
--- a/drivers/staging/greybus/connection.h
+++ b/drivers/staging/greybus/connection.h
@@ -12,8 +12,6 @@
 
 #include <linux/list.h>
 
-#include "greybus.h"
-
 enum gb_connection_state {
        GB_CONNECTION_STATE_INVALID     = 0,
        GB_CONNECTION_STATE_DISABLED    = 1,
@@ -24,38 +22,50 @@ enum gb_connection_state {
 
 struct gb_connection {
        struct greybus_host_device      *hd;
-       struct gb_interface             *interface;
+       struct gb_bundle                *bundle;
        struct device                   dev;
        u16                             hd_cport_id;
-       u16                             interface_cport_id;
+       u16                             intf_cport_id;
 
        struct list_head                hd_links;
-       struct list_head                interface_links;
+       struct list_head                bundle_links;
 
        struct gb_protocol              *protocol;
+       u8                              protocol_id;
+       u8                              major;
+       u8                              minor;
+       u8                              module_major;
+       u8                              module_minor;
 
+       spinlock_t                      lock;
        enum gb_connection_state        state;
+       struct list_head                operations;
+
+       struct workqueue_struct         *wq;
 
        atomic_t                        op_cycle;
-       struct list_head                operations;
 
        void                            *private;
 };
 #define to_gb_connection(d) container_of(d, struct gb_connection, dev)
 
-struct gb_connection *gb_connection_create(struct gb_interface *interface,
+int svc_update_connection(struct gb_interface *intf,
+                         struct gb_connection *connection);
+struct gb_connection *gb_connection_create(struct gb_bundle *bundle,
                                u16 cport_id, u8 protocol_id);
+struct gb_connection *gb_connection_create_range(struct greybus_host_device *hd,
+                          struct gb_bundle *bundle, struct device *parent,
+                          u16 cport_id, u8 protocol_id, u32 ida_start,
+                          u32 ida_end);
 void gb_connection_destroy(struct gb_connection *connection);
 
 int gb_connection_init(struct gb_connection *connection);
 void gb_connection_exit(struct gb_connection *connection);
-
-struct gb_connection *gb_hd_connection_find(struct greybus_host_device *hd,
-                               u16 cport_id);
+void gb_hd_connections_exit(struct greybus_host_device *hd);
 
 void greybus_data_rcvd(struct greybus_host_device *hd, u16 cport_id,
                        u8 *data, size_t length);
-__printf(2, 3)
-void gb_connection_err(struct gb_connection *connection, const char *fmt, ...);
+
+void gb_connection_bind_protocol(struct gb_connection *connection);
 
 #endif /* __CONNECTION_H */