On 10/01/2017 03:19 PM, Bin Meng wrote:
This parameter is never used.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Applied all to u-boot-usb/master , buildtesting .
drivers/usb/emul/sandbox_flash.c | 3 +-- drivers/usb/emul/sandbox_hub.c | 3 +-- drivers/usb/emul/sandbox_keyb.c | 3 +-- drivers/usb/emul/usb-emul-uclass.c | 4 ++-- include/usb.h | 5 ++--- 5 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c index 98d20c0..2f84b36 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -390,8 +390,7 @@ static int sandbox_flash_bind(struct udevice *dev) fs[2].id = STRINGID_SERIAL; fs[2].s = dev->name;
- return usb_emul_setup_device(dev, PACKET_SIZE_64, plat->flash_strings,
flash_desc_list);
- return usb_emul_setup_device(dev, plat->flash_strings, flash_desc_list);
}
static int sandbox_flash_probe(struct udevice *dev) diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c index 1432858..9ed7000 100644 --- a/drivers/usb/emul/sandbox_hub.c +++ b/drivers/usb/emul/sandbox_hub.c @@ -274,8 +274,7 @@ static int sandbox_hub_submit_control_msg(struct udevice *bus,
static int sandbox_hub_bind(struct udevice *dev) {
- return usb_emul_setup_device(dev, PACKET_SIZE_64, hub_strings,
hub_desc_list);
- return usb_emul_setup_device(dev, hub_strings, hub_desc_list);
}
static int sandbox_child_post_bind(struct udevice *dev) diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c index 2735985..cff0176 100644 --- a/drivers/usb/emul/sandbox_keyb.c +++ b/drivers/usb/emul/sandbox_keyb.c @@ -208,8 +208,7 @@ static int sandbox_keyb_bind(struct udevice *dev) fs[2].id = STRINGID_SERIAL; fs[2].s = dev->name;
- return usb_emul_setup_device(dev, PACKET_SIZE_8, plat->keyb_strings,
keyb_desc_list);
- return usb_emul_setup_device(dev, plat->keyb_strings, keyb_desc_list);
}
static int sandbox_keyb_probe(struct udevice *dev) diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c index 6e03c1e..e4a267b 100644 --- a/drivers/usb/emul/usb-emul-uclass.c +++ b/drivers/usb/emul/usb-emul-uclass.c @@ -229,8 +229,8 @@ int usb_emul_int(struct udevice *emul, struct usb_device *udev, return ops->interrupt(emul, udev, pipe, buffer, length, interval); }
-int usb_emul_setup_device(struct udevice *dev, int maxpacketsize,
struct usb_string *strings, void **desc_list)+int usb_emul_setup_device(struct udevice *dev, struct usb_string *strings,
void **desc_list){ struct usb_dev_platdata *plat = dev_get_parent_platdata(dev); struct usb_generic_descriptor **ptr; diff --git a/include/usb.h b/include/usb.h index 0ddc082..1563c9a 100644 --- a/include/usb.h +++ b/include/usb.h @@ -976,7 +976,6 @@ int usb_get_max_xfer_size(struct usb_device *dev, size_t *size);
- the USB emulation uclass about the features of the emulator.
- @dev: Emulation device
- @maxpacketsize: Maximum packet size (e.g. PACKET_SIZE_64)
- @strings: List of USB string descriptors, terminated by a NULL
entry- @desc_list: List of points or USB descriptors, terminated by NULL.
@@ -984,8 +983,8 @@ int usb_get_max_xfer_size(struct usb_device *dev, size_t *size);
and others follow on after that.- @return 0 if OK, -ENOSYS if not implemented, other -ve on error
*/ -int usb_emul_setup_device(struct udevice *dev, int maxpacketsize,
struct usb_string *strings, void **desc_list);+int usb_emul_setup_device(struct udevice *dev, struct usb_string *strings,
void **desc_list);/**
- usb_emul_control() - Send a control packet to an emulator