greybus: make svc_set_route_send() public
authorAlex Elder <elder@linaro.org>
Wed, 22 Oct 2014 07:04:31 +0000 (02:04 -0500)
committerGreg Kroah-Hartman <greg@kroah.com>
Wed, 22 Oct 2014 09:20:28 +0000 (17:20 +0800)
Give svc_set_route_send() non-private scope so it can be used by a
function outside "ap.c" in the next patch.  Change its type so it
can tell its caller if an error occurs.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/staging/greybus/ap.c
drivers/staging/greybus/greybus.h

index 46553b1..7ea329c 100644 (file)
@@ -100,24 +100,26 @@ static void svc_handshake(struct svc_function_handshake *handshake,
        svc_msg->handshake.version_major = GREYBUS_VERSION_MAJOR;
        svc_msg->handshake.version_minor = GREYBUS_VERSION_MINOR;
        svc_msg->handshake.handshake_type = SVC_HANDSHAKE_AP_HELLO;
-       svc_msg_send(svc_msg, hd);
+
+       (void)svc_msg_send(svc_msg, hd);
 }
 
-static void svc_set_route_send(struct gb_interface *interface,
+int svc_set_route_send(struct gb_interface *interface,
                               struct greybus_host_device *hd)
 {
        struct svc_msg *svc_msg;
 
        svc_msg = svc_msg_alloc(SVC_FUNCTION_UNIPRO_NETWORK_MANAGEMENT);
        if (!svc_msg)
-               return;
+               return -ENOMEM;
 
        svc_msg->header.function_id = SVC_FUNCTION_UNIPRO_NETWORK_MANAGEMENT;
        svc_msg->header.message_type = SVC_MSG_DATA;
        svc_msg->header.payload_length =
                cpu_to_le16(sizeof(struct svc_function_unipro_set_route));
        svc_msg->management.set_route.device_id = interface->device_id;
-       svc_msg_send(svc_msg, hd);
+
+       return svc_msg_send(svc_msg, hd);
 }
 
 static void svc_management(struct svc_function_unipro_management *management,
@@ -149,7 +151,7 @@ static void svc_management(struct svc_function_unipro_management *management,
                        return;
                }
                interface->device_id = management->link_up.device_id;
-               svc_set_route_send(interface, hd);
+               (void)svc_set_route_send(interface, hd);
                break;
        case SVC_MANAGEMENT_AP_DEVICE_ID:
                hd->device_id = management->ap_device_id.device_id;
index 4baa372..617d55c 100644 (file)
@@ -275,7 +275,8 @@ void gb_gpio_controller_exit(struct gb_connection *connection);
 int gb_tty_init(void);
 void gb_tty_exit(void);
 
-
+int svc_set_route_send(struct gb_interface *interface,
+                              struct greybus_host_device *hd);
 
 #endif /* __KERNEL__ */
 #endif /* __LINUX_GREYBUS_H */