diff options
| author | Jens Axboe <axboe@fb.com> | 2017-06-16 19:14:59 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-06-16 19:14:59 +0300 |
| commit | c27b2d634f81d1472a8107fc857481b67555d9bd (patch) | |
| tree | 3c35ede17e6f13f70a92529f097f2d2412308782 /drivers/usb/misc/ucsi.c | |
| parent | cc3f2e9fbf905427b48e112288fbd8f0dbd3252d (diff) | |
| parent | 6b8190d61a622e095f04451437953acd2d74b371 (diff) | |
| download | linux-c27b2d634f81d1472a8107fc857481b67555d9bd.tar.xz | |
Merge branch 'nvme-4.13' of git://git.infradead.org/nvme into for-4.13/block
Pull NVMe changes for 4.13 from Christoph:
Highlights:
- UUID identifier support from Johannes
- Lots of cleanups from Sagi
- Host Memory Buffer support from me
And lots of cleanups and smaller fixes of course.
Note that the UUID identifier changes are based on top of the uuid tree.
I am the maintainer of that tree and will send it to Linus as soon as
4.12 is released as various other trees depend on it as well (and the
diffstat includes those changes unfortunately)
Diffstat (limited to 'drivers/usb/misc/ucsi.c')
| -rw-r--r-- | drivers/usb/misc/ucsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/misc/ucsi.c b/drivers/usb/misc/ucsi.c index 07397bddefa3..81251aaa20f9 100644 --- a/drivers/usb/misc/ucsi.c +++ b/drivers/usb/misc/ucsi.c @@ -55,13 +55,13 @@ struct ucsi { static int ucsi_acpi_cmd(struct ucsi *ucsi, struct ucsi_control *ctrl) { - uuid_le uuid = UUID_LE(0x6f8398c2, 0x7ca4, 0x11e4, - 0xad, 0x36, 0x63, 0x10, 0x42, 0xb5, 0x00, 0x8f); + guid_t guid = GUID_INIT(0x6f8398c2, 0x7ca4, 0x11e4, + 0xad, 0x36, 0x63, 0x10, 0x42, 0xb5, 0x00, 0x8f); union acpi_object *obj; ucsi->data->ctrl.raw_cmd = ctrl->raw_cmd; - obj = acpi_evaluate_dsm(ACPI_HANDLE(ucsi->dev), uuid.b, 1, 1, NULL); + obj = acpi_evaluate_dsm(ACPI_HANDLE(ucsi->dev), &guid, 1, 1, NULL); if (!obj) { dev_err(ucsi->dev, "%s: failed to evaluate _DSM\n", __func__); return -EIO; |