diff options
Diffstat (limited to 'drivers/usb/gadget/tcm_usb_gadget.c')
-rw-r--r-- | drivers/usb/gadget/tcm_usb_gadget.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/usb/gadget/tcm_usb_gadget.c b/drivers/usb/gadget/tcm_usb_gadget.c index eaa1005377fc..97e68b38cfdf 100644 --- a/drivers/usb/gadget/tcm_usb_gadget.c +++ b/drivers/usb/gadget/tcm_usb_gadget.c | |||
@@ -1472,16 +1472,6 @@ static int usbg_queue_tm_rsp(struct se_cmd *se_cmd) | |||
1472 | return 0; | 1472 | return 0; |
1473 | } | 1473 | } |
1474 | 1474 | ||
1475 | static u16 usbg_set_fabric_sense_len(struct se_cmd *se_cmd, u32 sense_length) | ||
1476 | { | ||
1477 | return 0; | ||
1478 | } | ||
1479 | |||
1480 | static u16 usbg_get_fabric_sense_len(void) | ||
1481 | { | ||
1482 | return 0; | ||
1483 | } | ||
1484 | |||
1485 | static const char *usbg_check_wwn(const char *name) | 1475 | static const char *usbg_check_wwn(const char *name) |
1486 | { | 1476 | { |
1487 | const char *n; | 1477 | const char *n; |
@@ -1822,7 +1812,7 @@ static ssize_t tcm_usbg_tpg_store_nexus( | |||
1822 | ret = tcm_usbg_drop_nexus(tpg); | 1812 | ret = tcm_usbg_drop_nexus(tpg); |
1823 | return (!ret) ? count : ret; | 1813 | return (!ret) ? count : ret; |
1824 | } | 1814 | } |
1825 | if (strlen(page) > USBG_NAMELEN) { | 1815 | if (strlen(page) >= USBG_NAMELEN) { |
1826 | pr_err("Emulated NAA Sas Address: %s, exceeds" | 1816 | pr_err("Emulated NAA Sas Address: %s, exceeds" |
1827 | " max: %d\n", page, USBG_NAMELEN); | 1817 | " max: %d\n", page, USBG_NAMELEN); |
1828 | return -EINVAL; | 1818 | return -EINVAL; |
@@ -1907,8 +1897,6 @@ static struct target_core_fabric_ops usbg_ops = { | |||
1907 | .queue_data_in = usbg_send_read_response, | 1897 | .queue_data_in = usbg_send_read_response, |
1908 | .queue_status = usbg_send_status_response, | 1898 | .queue_status = usbg_send_status_response, |
1909 | .queue_tm_rsp = usbg_queue_tm_rsp, | 1899 | .queue_tm_rsp = usbg_queue_tm_rsp, |
1910 | .get_fabric_sense_len = usbg_get_fabric_sense_len, | ||
1911 | .set_fabric_sense_len = usbg_set_fabric_sense_len, | ||
1912 | .check_stop_free = usbg_check_stop_free, | 1900 | .check_stop_free = usbg_check_stop_free, |
1913 | 1901 | ||
1914 | .fabric_make_wwn = usbg_make_tport, | 1902 | .fabric_make_wwn = usbg_make_tport, |
@@ -1968,7 +1956,6 @@ static void usbg_deregister_configfs(void) | |||
1968 | static struct usb_interface_descriptor bot_intf_desc = { | 1956 | static struct usb_interface_descriptor bot_intf_desc = { |
1969 | .bLength = sizeof(bot_intf_desc), | 1957 | .bLength = sizeof(bot_intf_desc), |
1970 | .bDescriptorType = USB_DT_INTERFACE, | 1958 | .bDescriptorType = USB_DT_INTERFACE, |
1971 | .bAlternateSetting = 0, | ||
1972 | .bNumEndpoints = 2, | 1959 | .bNumEndpoints = 2, |
1973 | .bAlternateSetting = USB_G_ALT_INT_BBB, | 1960 | .bAlternateSetting = USB_G_ALT_INT_BBB, |
1974 | .bInterfaceClass = USB_CLASS_MASS_STORAGE, | 1961 | .bInterfaceClass = USB_CLASS_MASS_STORAGE, |