hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

greybus: hd/es2: remove obsolete callbacks 

Remove the now obsolete ping and cport_features_enable/disable
callbacks.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2016-08-26 12:55:50 +02:00 committed by Greg Kroah-Hartman
parent aac0839ea2
commit 2045c9f265
3 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/staging/greybus/es2.c
View File

@ -892,41 +892,6 @@ static int latency_tag_disable(struct gb_host_device *hd, u16 cport_id)
return retval; return retval;
} }
static int cport_features_enable(struct gb_host_device *hd, u16 cport_id)
{
int retval;
struct es2_ap_dev *es2 = hd_to_es2(hd);
struct usb_device *udev = es2->usb_dev;
retval = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
GB_APB_REQUEST_CPORT_FEAT_EN,
USB_DIR_OUT | USB_TYPE_VENDOR |
USB_RECIP_INTERFACE, cport_id, 0, NULL,
0, ES2_USB_CTRL_TIMEOUT);
if (retval < 0)
dev_err(&udev->dev, "Cannot enable CPort features for cport %u: %d\n",
cport_id, retval);
return retval;
}
static int cport_features_disable(struct gb_host_device *hd, u16 cport_id)
{
int retval;
struct es2_ap_dev *es2 = hd_to_es2(hd);
struct usb_device *udev = es2->usb_dev;
retval = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
GB_APB_REQUEST_CPORT_FEAT_DIS,
USB_DIR_OUT | USB_TYPE_VENDOR |
USB_RECIP_INTERFACE, cport_id, 0, NULL,
0, ES2_USB_CTRL_TIMEOUT);
if (retval < 0)
dev_err(&udev->dev,
"Cannot disable CPort features for cport %u: %d\n",
cport_id, retval);
return retval;
}
static int timesync_enable(struct gb_host_device *hd, u8 count, static int timesync_enable(struct gb_host_device *hd, u8 count,
u64 frame_time, u32 strobe_delay, u32 refclk) u64 frame_time, u32 strobe_delay, u32 refclk)
{ {
@ -1048,8 +1013,6 @@ static struct gb_hd_driver es2_driver = {
.latency_tag_enable = latency_tag_enable, .latency_tag_enable = latency_tag_enable,
.latency_tag_disable = latency_tag_disable, .latency_tag_disable = latency_tag_disable,
.output = output, .output = output,
.cport_features_enable = cport_features_enable,
.cport_features_disable = cport_features_disable,
.timesync_enable = timesync_enable, .timesync_enable = timesync_enable,
.timesync_disable = timesync_disable, .timesync_disable = timesync_disable,
.timesync_authoritative = timesync_authoritative, .timesync_authoritative = timesync_authoritative,

4
drivers/staging/greybus/greybus_protocols.h
View File

@ -250,10 +250,6 @@ struct gb_control_intf_pm_response {
/* request to control audio streaming */ /* request to control audio streaming */
#define GB_APB_REQUEST_AUDIO_CONTROL 0x09 #define GB_APB_REQUEST_AUDIO_CONTROL 0x09
/* vendor requests to enable/disable CPort features */
#define GB_APB_REQUEST_CPORT_FEAT_EN 0x0b
#define GB_APB_REQUEST_CPORT_FEAT_DIS 0x0c
/* TimeSync requests */ /* TimeSync requests */
#define GB_APB_REQUEST_TIMESYNC_ENABLE 0x0d #define GB_APB_REQUEST_TIMESYNC_ENABLE 0x0d
#define GB_APB_REQUEST_TIMESYNC_DISABLE 0x0e #define GB_APB_REQUEST_TIMESYNC_DISABLE 0x0e

3
drivers/staging/greybus/hd.h
View File

@ -24,7 +24,6 @@ struct gb_hd_driver {
int (*cport_disable)(struct gb_host_device *hd, u16 cport_id); int (*cport_disable)(struct gb_host_device *hd, u16 cport_id);
int (*cport_connected)(struct gb_host_device *hd, u16 cport_id); int (*cport_connected)(struct gb_host_device *hd, u16 cport_id);
int (*cport_flush)(struct gb_host_device *hd, u16 cport_id); int (*cport_flush)(struct gb_host_device *hd, u16 cport_id);
int (*cport_ping)(struct gb_host_device *hd, u16 cport_id);
int (*cport_shutdown)(struct gb_host_device *hd, u16 cport_id, int (*cport_shutdown)(struct gb_host_device *hd, u16 cport_id,
u8 phase, unsigned int timeout); u8 phase, unsigned int timeout);
int (*cport_quiesce)(struct gb_host_device *hd, u16 cport_id, int (*cport_quiesce)(struct gb_host_device *hd, u16 cport_id,
@ -38,8 +37,6 @@ struct gb_hd_driver {
int (*latency_tag_disable)(struct gb_host_device *hd, u16 cport_id); int (*latency_tag_disable)(struct gb_host_device *hd, u16 cport_id);
int (*output)(struct gb_host_device *hd, void *req, u16 size, u8 cmd, int (*output)(struct gb_host_device *hd, void *req, u16 size, u8 cmd,
bool async); bool async);
int (*cport_features_enable)(struct gb_host_device *hd, u16 cport_id);
int (*cport_features_disable)(struct gb_host_device *hd, u16 cport_id);
int (*timesync_enable)(struct gb_host_device *hd, u8 count, int (*timesync_enable)(struct gb_host_device *hd, u8 count,
u64 frame_time, u32 strobe_delay, u32 refclk); u64 frame_time, u32 strobe_delay, u32 refclk);
int (*timesync_disable)(struct gb_host_device *hd); int (*timesync_disable)(struct gb_host_device *hd);