projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: treewide: Rename auto_alloc_size members to be shorter
[platform/kernel/u-boot.git]
/
drivers
/
usb
/
host
/
usb-sandbox.c
diff --git
a/drivers/usb/host/usb-sandbox.c
b/drivers/usb/host/usb-sandbox.c
index
1a35a00
..
e5442e7
100644
(file)
--- a/
drivers/usb/host/usb-sandbox.c
+++ b/
drivers/usb/host/usb-sandbox.c
@@
-1,12
+1,12
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
/*
* (C) Copyright 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <dm.h>
*/
#include <common.h>
#include <dm.h>
+#include <log.h>
#include <usb.h>
#include <dm/root.h>
#include <usb.h>
#include <dm/root.h>
@@
-100,7
+100,7
@@
static int sandbox_submit_bulk(struct udevice *bus, struct usb_device *udev,
static int sandbox_submit_int(struct udevice *bus, struct usb_device *udev,
unsigned long pipe, void *buffer, int length,
static int sandbox_submit_int(struct udevice *bus, struct usb_device *udev,
unsigned long pipe, void *buffer, int length,
- int interval)
+ int interval
, bool nonblock
)
{
struct udevice *emul;
int ret;
{
struct udevice *emul;
int ret;
@@
-111,7
+111,8
@@
static int sandbox_submit_int(struct udevice *bus, struct usb_device *udev,
usbmon_trace(bus, pipe, NULL, emul);
if (ret)
return ret;
usbmon_trace(bus, pipe, NULL, emul);
if (ret)
return ret;
- ret = usb_emul_int(emul, udev, pipe, buffer, length, interval);
+ ret = usb_emul_int(emul, udev, pipe, buffer, length, interval,
+ nonblock);
return ret;
}
return ret;
}
@@
-154,5
+155,5
@@
U_BOOT_DRIVER(usb_sandbox) = {
.of_match = sandbox_usb_ids,
.probe = sandbox_usb_probe,
.ops = &sandbox_usb_ops,
.of_match = sandbox_usb_ids,
.probe = sandbox_usb_probe,
.ops = &sandbox_usb_ops,
- .priv_auto
_alloc_size
= sizeof(struct sandbox_usb_ctrl),
+ .priv_auto
= sizeof(struct sandbox_usb_ctrl),
};
};