michaelh/zephyr
1
0
Fork 0
Code Releases Activity

usb: Remove usb_dc_ep_set_callback return code

Browse source 
Make usb_dc_ep_set_callback() return void since the code is never
used.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This commit is contained in:
Andrei Emeltchenko 2019-03-06 14:37:44 +02:00 • committed by Anas Nashif
commit 8d6fbde898
9 changed files with 12 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/device/usb_dc_dw.c
View file

@ -1223,11 +1223,9 @@ int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
return 0; return 0;
} }
int usb_dc_set_status_callback(const usb_dc_status_callback cb) void usb_dc_set_status_callback(const usb_dc_status_callback cb)
{ {
usb_dw_ctrl.status_cb = cb; usb_dw_ctrl.status_cb = cb;
return 0;
} }
int usb_dc_ep_mps(const u8_t ep) int usb_dc_ep_mps(const u8_t ep)

5
drivers/usb/device/usb_dc_kinetis.c
View file

@ -831,12 +831,11 @@ int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
return 0; return 0;
} }
int usb_dc_set_status_callback(const usb_dc_status_callback cb) void usb_dc_set_status_callback(const usb_dc_status_callback cb)
{ {
dev_data.status_cb = cb;
LOG_DBG(""); LOG_DBG("");
return 0; dev_data.status_cb = cb;
} }
int usb_dc_ep_mps(const u8_t ep) int usb_dc_ep_mps(const u8_t ep)

4
drivers/usb/device/usb_dc_native_posix.c
View file

@ -473,11 +473,9 @@ int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
return 0; return 0;
} }
int usb_dc_set_status_callback(const usb_dc_status_callback cb) void usb_dc_set_status_callback(const usb_dc_status_callback cb)
{ {
usbip_ctrl.status_cb = cb; usbip_ctrl.status_cb = cb;
return 0;
} }
int usb_dc_ep_mps(const u8_t ep) int usb_dc_ep_mps(const u8_t ep)

3
drivers/usb/device/usb_dc_nrfx.c
View file

@ -1826,10 +1826,9 @@ int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
return 0; return 0;
} }
int usb_dc_set_status_callback(const usb_dc_status_callback cb) void usb_dc_set_status_callback(const usb_dc_status_callback cb)
{ {
get_usbd_ctx()->status_cb = cb; get_usbd_ctx()->status_cb = cb;
return 0;
} }
int usb_dc_ep_mps(const u8_t ep) int usb_dc_ep_mps(const u8_t ep)

5
drivers/usb/device/usb_dc_sam.c
View file

@ -372,12 +372,11 @@ int usb_dc_set_address(u8_t addr)
} }
/* Set USB device controller status callback */ /* Set USB device controller status callback */
int usb_dc_set_status_callback(const usb_dc_status_callback cb) void usb_dc_set_status_callback(const usb_dc_status_callback cb)
{ {
dev_data.status_cb = cb;
LOG_DBG(""); LOG_DBG("");
return 0; dev_data.status_cb = cb;
} }
/* Check endpoint capabilities */ /* Check endpoint capabilities */

4
drivers/usb/device/usb_dc_sam0.c
View file

@ -251,13 +251,11 @@ int usb_dc_set_address(const u8_t addr)
return 0; return 0;
} }
int usb_dc_set_status_callback(const usb_dc_status_callback cb) void usb_dc_set_status_callback(const usb_dc_status_callback cb)
{ {
struct usb_sam0_data *data = usb_sam0_get_data(); struct usb_sam0_data *data = usb_sam0_get_data();
data->cb = cb; data->cb = cb;
return 0;
} }
int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg) int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)

4
drivers/usb/device/usb_dc_stm32.c
View file

@ -480,13 +480,11 @@ int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
return 0; return 0;
} }
int usb_dc_set_status_callback(const usb_dc_status_callback cb) void usb_dc_set_status_callback(const usb_dc_status_callback cb)
{ {
LOG_DBG(""); LOG_DBG("");
usb_dc_stm32_state.status_cb = cb; usb_dc_stm32_state.status_cb = cb;
return 0;
} }
int usb_dc_set_address(const u8_t addr) int usb_dc_set_address(const u8_t addr)

4
include/drivers/usb/usb_dc.h
View file

@ -173,10 +173,8 @@ int usb_dc_set_address(const u8_t addr);
* The status code are described by the usb_dc_status_code enumeration. * The status code are described by the usb_dc_status_code enumeration.
* *
* @param[in] cb Callback function * @param[in] cb Callback function
*
* @return 0 on success, negative errno code on fail.
*/ */
int usb_dc_set_status_callback(const usb_dc_status_callback cb); void usb_dc_set_status_callback(const usb_dc_status_callback cb);
/** /**
* @brief check endpoint capabilities * @brief check endpoint capabilities

10
subsys/usb/usb_device.c
View file

@ -1051,10 +1051,7 @@ int usb_enable(struct usb_cfg_data *config)
} }
usb_register_status_callback(forward_status_cb); usb_register_status_callback(forward_status_cb);
ret = usb_dc_set_status_callback(forward_status_cb); usb_dc_set_status_callback(forward_status_cb);
if (ret < 0) {
return ret;
}
ret = usb_dc_attach(); ret = usb_dc_attach();
if (ret < 0) { if (ret < 0) {
@ -1577,10 +1574,7 @@ static int usb_composite_init(struct device *dev)
usb_register_custom_req_handler(custom_handler); usb_register_custom_req_handler(custom_handler);
usb_register_status_callback(forward_status_cb); usb_register_status_callback(forward_status_cb);
ret = usb_dc_set_status_callback(forward_status_cb); usb_dc_set_status_callback(forward_status_cb);
if (ret < 0) {
return ret;
}
/* Enable VBUS if needed */ /* Enable VBUS if needed */
ret = usb_vbus_set(true); ret = usb_vbus_set(true);