]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
greybus: connection: add connection-flag interface
authorJohan Hovold <johan@hovoldconsulting.com>
Thu, 3 Mar 2016 12:34:36 +0000 (13:34 +0100)
committerGreg Kroah-Hartman <gregkh@google.com>
Sat, 5 Mar 2016 02:26:08 +0000 (18:26 -0800)
Add interface for associating a flag bitmask with a connection when
creating it.

Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/connection.c
drivers/staging/greybus/connection.h

index 34e26dc6e249ec41551ef3db31fbe4f10ce6c5bb..eaceafc4f8dd896b1bd83bd37956d27dca740454 100644 (file)
@@ -119,6 +119,7 @@ static void gb_connection_init_name(struct gb_connection *connection)
  * @bundle:            remote-interface bundle (may be NULL)
  * @cport_id:          remote-interface cport id, or 0 for static connections
  * @handler:           request handler (may be NULL)
+ * @flags:             connection flags
  *
  * Create a Greybus connection, representing the bidirectional link
  * between a CPort on a (local) Greybus host device and a CPort on
@@ -137,7 +138,8 @@ static struct gb_connection *
 _gb_connection_create(struct gb_host_device *hd, int hd_cport_id,
                                struct gb_interface *intf,
                                struct gb_bundle *bundle, int cport_id,
-                               gb_request_handler_t handler)
+                               gb_request_handler_t handler,
+                               unsigned long flags)
 {
        struct gb_connection *connection;
        struct ida *id_map = &hd->cport_id_map;
@@ -180,6 +182,7 @@ _gb_connection_create(struct gb_host_device *hd, int hd_cport_id,
        connection->intf = intf;
        connection->bundle = bundle;
        connection->handler = handler;
+       connection->flags = flags;
        connection->state = GB_CONNECTION_STATE_DISABLED;
 
        atomic_set(&connection->op_cycle, 0);
@@ -226,13 +229,14 @@ struct gb_connection *
 gb_connection_create_static(struct gb_host_device *hd, u16 hd_cport_id,
                                        gb_request_handler_t handler)
 {
-       return _gb_connection_create(hd, hd_cport_id, NULL, NULL, 0, handler);
+       return _gb_connection_create(hd, hd_cport_id, NULL, NULL, 0, handler,
+                                       0);
 }
 
 struct gb_connection *
 gb_connection_create_control(struct gb_interface *intf)
 {
-       return _gb_connection_create(intf->hd, -1, intf, NULL, 0, NULL);
+       return _gb_connection_create(intf->hd, -1, intf, NULL, 0, NULL, 0);
 }
 
 struct gb_connection *
@@ -242,10 +246,22 @@ gb_connection_create(struct gb_bundle *bundle, u16 cport_id,
        struct gb_interface *intf = bundle->intf;
 
        return _gb_connection_create(intf->hd, -1, intf, bundle, cport_id,
-                                       handler);
+                                       handler, 0);
 }
 EXPORT_SYMBOL_GPL(gb_connection_create);
 
+struct gb_connection *
+gb_connection_create_flags(struct gb_bundle *bundle, u16 cport_id,
+                                       gb_request_handler_t handler,
+                                       unsigned long flags)
+{
+       struct gb_interface *intf = bundle->intf;
+
+       return _gb_connection_create(intf->hd, -1, intf, bundle, cport_id,
+                                       handler, flags);
+}
+EXPORT_SYMBOL_GPL(gb_connection_create_flags);
+
 static int gb_connection_hd_cport_enable(struct gb_connection *connection)
 {
        struct gb_host_device *hd = connection->hd;
index 24b7d6f476711464c23533c65a0843c8ccc4d17c..d5ac1459332a766a04cbda609ed068c6b5b01daa 100644 (file)
@@ -36,6 +36,7 @@ struct gb_connection {
        struct list_head                bundle_links;
 
        gb_request_handler_t            handler;
+       unsigned long                   flags;
 
        struct gb_protocol              *protocol;
        u8                              module_major;
@@ -59,6 +60,9 @@ struct gb_connection *gb_connection_create_static(struct gb_host_device *hd,
 struct gb_connection *gb_connection_create_control(struct gb_interface *intf);
 struct gb_connection *gb_connection_create(struct gb_bundle *bundle,
                                u16 cport_id, gb_request_handler_t handler);
+struct gb_connection * gb_connection_create_flags(struct gb_bundle *bundle,
+                               u16 cport_id, gb_request_handler_t handler,
+                               unsigned long flags);
 void gb_connection_destroy(struct gb_connection *connection);
 
 static inline bool gb_connection_is_static(struct gb_connection *connection)