Commit d187576f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

greybus: remove submit_svc from the host driver

The callback is never used anymore, so remove it from struct
greybus_host_driver as well as from the es1 and es2 drivers.
Tested-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 90c807e4
...@@ -175,8 +175,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver ...@@ -175,8 +175,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver
* Validate that the driver implements all of the callbacks * Validate that the driver implements all of the callbacks
* so that we don't have to every time we make them. * so that we don't have to every time we make them.
*/ */
if ((!driver->message_send) || (!driver->message_cancel) || if ((!driver->message_send) || (!driver->message_cancel)) {
(!driver->submit_svc)) {
pr_err("Must implement all greybus_host_driver callbacks!\n"); pr_err("Must implement all greybus_host_driver callbacks!\n");
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include "greybus.h" #include "greybus.h"
#include "svc_msg.h"
#include "kernel_ver.h" #include "kernel_ver.h"
/* Memory sizes for the buffers sent to/from the ES1 controller */ /* Memory sizes for the buffers sent to/from the ES1 controller */
...@@ -95,26 +94,6 @@ static void usb_log_enable(struct es1_ap_dev *es1); ...@@ -95,26 +94,6 @@ static void usb_log_enable(struct es1_ap_dev *es1);
static void usb_log_disable(struct es1_ap_dev *es1); static void usb_log_disable(struct es1_ap_dev *es1);
#define ES1_TIMEOUT 500 /* 500 ms for the SVC to do something */ #define ES1_TIMEOUT 500 /* 500 ms for the SVC to do something */
static int submit_svc(struct svc_msg *svc_msg, struct greybus_host_device *hd)
{
struct es1_ap_dev *es1 = hd_to_es1(hd);
int retval;
/* SVC messages go down our control pipe */
retval = usb_control_msg(es1->usb_dev,
usb_sndctrlpipe(es1->usb_dev,
es1->control_endpoint),
REQUEST_SVC,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
0x00, 0x00,
(char *)svc_msg,
sizeof(*svc_msg),
ES1_TIMEOUT);
if (retval != sizeof(*svc_msg))
return retval;
return 0;
}
static struct urb *next_free_urb(struct es1_ap_dev *es1, gfp_t gfp_mask) static struct urb *next_free_urb(struct es1_ap_dev *es1, gfp_t gfp_mask)
{ {
...@@ -295,7 +274,6 @@ static struct greybus_host_driver es1_driver = { ...@@ -295,7 +274,6 @@ static struct greybus_host_driver es1_driver = {
.hd_priv_size = sizeof(struct es1_ap_dev), .hd_priv_size = sizeof(struct es1_ap_dev),
.message_send = message_send, .message_send = message_send,
.message_cancel = message_cancel, .message_cancel = message_cancel,
.submit_svc = submit_svc,
}; };
/* Common function to report consistent warnings based on URB status */ /* Common function to report consistent warnings based on URB status */
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include "greybus.h" #include "greybus.h"
#include "svc_msg.h"
#include "kernel_ver.h" #include "kernel_ver.h"
/* Memory sizes for the buffers sent to/from the ES1 controller */ /* Memory sizes for the buffers sent to/from the ES1 controller */
...@@ -134,26 +133,6 @@ static int cport_to_ep(struct es1_ap_dev *es1, u16 cport_id) ...@@ -134,26 +133,6 @@ static int cport_to_ep(struct es1_ap_dev *es1, u16 cport_id)
} }
#define ES1_TIMEOUT 500 /* 500 ms for the SVC to do something */ #define ES1_TIMEOUT 500 /* 500 ms for the SVC to do something */
static int submit_svc(struct svc_msg *svc_msg, struct greybus_host_device *hd)
{
struct es1_ap_dev *es1 = hd_to_es1(hd);
int retval;
/* SVC messages go down our control pipe */
retval = usb_control_msg(es1->usb_dev,
usb_sndctrlpipe(es1->usb_dev,
es1->control_endpoint),
REQUEST_SVC,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
0x00, 0x00,
(char *)svc_msg,
sizeof(*svc_msg),
ES1_TIMEOUT);
if (retval != sizeof(*svc_msg))
return retval;
return 0;
}
static int ep_in_use(struct es1_ap_dev *es1, int bulk_ep_set) static int ep_in_use(struct es1_ap_dev *es1, int bulk_ep_set)
{ {
...@@ -391,7 +370,6 @@ static struct greybus_host_driver es1_driver = { ...@@ -391,7 +370,6 @@ static struct greybus_host_driver es1_driver = {
.hd_priv_size = sizeof(struct es1_ap_dev), .hd_priv_size = sizeof(struct es1_ap_dev),
.message_send = message_send, .message_send = message_send,
.message_cancel = message_cancel, .message_cancel = message_cancel,
.submit_svc = submit_svc,
}; };
/* Common function to report consistent warnings based on URB status */ /* Common function to report consistent warnings based on URB status */
......
...@@ -84,8 +84,6 @@ struct greybus_host_driver { ...@@ -84,8 +84,6 @@ struct greybus_host_driver {
int (*message_send)(struct greybus_host_device *hd, u16 dest_cport_id, int (*message_send)(struct greybus_host_device *hd, u16 dest_cport_id,
struct gb_message *message, gfp_t gfp_mask); struct gb_message *message, gfp_t gfp_mask);
void (*message_cancel)(struct gb_message *message); void (*message_cancel)(struct gb_message *message);
int (*submit_svc)(struct svc_msg *svc_msg,
struct greybus_host_device *hd);
}; };
struct greybus_host_device { struct greybus_host_device {
......
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