greybus: hd/es2: remove obsolete callbacks

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Johan Hovold and committed by

Greg Kroah-Hartman 9 years ago 2045c9f2 aac0839e

-44

3 changed files

expand all

drivers

staging

greybus

es2.c

greybus_protocols.h

hd.h

-37

drivers/staging/greybus/es2.c

··· 892 892 return retval; 893 893 } 894 894 895 - static int cport_features_enable(struct gb_host_device *hd, u16 cport_id) 896 - { 897 - int retval; 898 - struct es2_ap_dev *es2 = hd_to_es2(hd); 899 - struct usb_device *udev = es2->usb_dev; 900 - 901 - retval = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 902 - GB_APB_REQUEST_CPORT_FEAT_EN, 903 - USB_DIR_OUT | USB_TYPE_VENDOR | 904 - USB_RECIP_INTERFACE, cport_id, 0, NULL, 905 - 0, ES2_USB_CTRL_TIMEOUT); 906 - if (retval < 0) 907 - dev_err(&udev->dev, "Cannot enable CPort features for cport %u: %d\n", 908 - cport_id, retval); 909 - return retval; 910 - } 911 - 912 - static int cport_features_disable(struct gb_host_device *hd, u16 cport_id) 913 - { 914 - int retval; 915 - struct es2_ap_dev *es2 = hd_to_es2(hd); 916 - struct usb_device *udev = es2->usb_dev; 917 - 918 - retval = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 919 - GB_APB_REQUEST_CPORT_FEAT_DIS, 920 - USB_DIR_OUT | USB_TYPE_VENDOR | 921 - USB_RECIP_INTERFACE, cport_id, 0, NULL, 922 - 0, ES2_USB_CTRL_TIMEOUT); 923 - if (retval < 0) 924 - dev_err(&udev->dev, 925 - "Cannot disable CPort features for cport %u: %d\n", 926 - cport_id, retval); 927 - return retval; 928 - } 929 - 930 895 static int timesync_enable(struct gb_host_device *hd, u8 count, 931 896 u64 frame_time, u32 strobe_delay, u32 refclk) 932 897 { ··· 1013 1048 .latency_tag_enable = latency_tag_enable, 1014 1049 .latency_tag_disable = latency_tag_disable, 1015 1050 .output = output, 1016 - .cport_features_enable = cport_features_enable, 1017 - .cport_features_disable = cport_features_disable, 1018 1051 .timesync_enable = timesync_enable, 1019 1052 .timesync_disable = timesync_disable, 1020 1053 .timesync_authoritative = timesync_authoritative,

-4

drivers/staging/greybus/greybus_protocols.h

··· 250 250 /* request to control audio streaming */ 251 251 #define GB_APB_REQUEST_AUDIO_CONTROL 0x09 252 252 253 - /* vendor requests to enable/disable CPort features */ 254 - #define GB_APB_REQUEST_CPORT_FEAT_EN 0x0b 255 - #define GB_APB_REQUEST_CPORT_FEAT_DIS 0x0c 256 - 257 253 /* TimeSync requests */ 258 254 #define GB_APB_REQUEST_TIMESYNC_ENABLE 0x0d 259 255 #define GB_APB_REQUEST_TIMESYNC_DISABLE 0x0e

-3

drivers/staging/greybus/hd.h

··· 24 24 int (*cport_disable)(struct gb_host_device *hd, u16 cport_id); 25 25 int (*cport_connected)(struct gb_host_device *hd, u16 cport_id); 26 26 int (*cport_flush)(struct gb_host_device *hd, u16 cport_id); 27 - int (*cport_ping)(struct gb_host_device *hd, u16 cport_id); 28 27 int (*cport_shutdown)(struct gb_host_device *hd, u16 cport_id, 29 28 u8 phase, unsigned int timeout); 30 29 int (*cport_quiesce)(struct gb_host_device *hd, u16 cport_id, ··· 37 38 int (*latency_tag_disable)(struct gb_host_device *hd, u16 cport_id); 38 39 int (*output)(struct gb_host_device *hd, void *req, u16 size, u8 cmd, 39 40 bool async); 40 - int (*cport_features_enable)(struct gb_host_device *hd, u16 cport_id); 41 - int (*cport_features_disable)(struct gb_host_device *hd, u16 cport_id); 42 41 int (*timesync_enable)(struct gb_host_device *hd, u8 count, 43 42 u64 frame_time, u32 strobe_delay, u32 refclk); 44 43 int (*timesync_disable)(struct gb_host_device *hd);