greybus: es1/2: Lets start using svc protocol

All bits and pieces are in place now. Lets start using svc protocol
instead of stuff present in ap.c.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Tested-by: Perry Hung <perry@leaflabs.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/es1.c b/drivers/staging/greybus/es1.c
index 0cb7a3c7ef72a0e7120aaba8cae79b1722e5b691..7d764a5afeb3fb22c78ee4d924e862ad289e0673 100644 (file)
--- a/drivers/staging/greybus/es1.c
+++ b/drivers/staging/greybus/es1.c
@@ -615,8 +615,6 @@ static int ap_probe(struct usb_interface *interface,
        bool bulk_out_found = false;
        int retval = -ENOMEM;
        int i;
-       u16 endo_id = 0x4755;   // FIXME - get endo "ID" from the SVC
-       u8 ap_intf_id = 0x01;   // FIXME - get endo "ID" from the SVC
        u8 svc_interval = 0;
 
        /* We need to fit a CPort ID in one byte of a message header */
@@ -718,16 +716,11 @@ static int ap_probe(struct usb_interface *interface,
                es1->cport_out_urb_busy[i] = false;     /* just to be anal */
        }
 
-       /*
-        * XXX Soon this will be initiated later, with a combination
-        * XXX of a Control protocol probe operation and a
-        * XXX subsequent Control protocol connected operation for
-        * XXX the SVC connection.  At that point we know we're
-        * XXX properly connected to an Endo.
-        */
-       retval = greybus_endo_setup(hd, endo_id, ap_intf_id);
-       if (retval)
+       /* Initialize AP's greybus interface */
+       if (!gb_ap_svc_connection_create(hd)) {
+               retval = -EINVAL;
                goto error;
+       }
 
        /* Start up our svc urb, which allows events to start flowing */
        retval = usb_submit_urb(es1->svc_urb, GFP_KERNEL);

diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 323721a2e2aa0ec3ab22dab6468991061187e91f..7621e95071ed2fa33ea294cec68b62173ae24465 100644 (file)
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -715,8 +715,6 @@ static int ap_probe(struct usb_interface *interface,
        int bulk_out = 0;
        int retval = -ENOMEM;
        int i;
-       u16 endo_id = 0x4755;   // FIXME - get endo "ID" from the SVC
-       u8 ap_intf_id = 0x01;   // FIXME - get endo "ID" from the SVC
        u8 svc_interval = 0;
 
        /* We need to fit a CPort ID in one byte of a message header */
@@ -822,16 +820,11 @@ static int ap_probe(struct usb_interface *interface,
                es1->cport_out_urb_busy[i] = false;     /* just to be anal */
        }
 
-       /*
-        * XXX Soon this will be initiated later, with a combination
-        * XXX of a Control protocol probe operation and a
-        * XXX subsequent Control protocol connected operation for
-        * XXX the SVC connection.  At that point we know we're
-        * XXX properly connected to an Endo.
-        */
-       retval = greybus_endo_setup(hd, endo_id, ap_intf_id);
-       if (retval)
+       /* Initialize AP's greybus interface */
+       if (!gb_ap_svc_connection_create(hd)) {
+               retval = -EINVAL;
                goto error;
+       }
 
        /* Start up our svc urb, which allows events to start flowing */
        retval = usb_submit_urb(es1->svc_urb, GFP_KERNEL);