UPSTREAM: usb_device: Fix up whitespace
Drop unnecessary spaces and indent with tabs, as per the coding style.
BUG=none
BRANCH=none
TEST=Build with `make distclean && make VERSION=none -j` with and
without this patch, the flashrom executable does not change.
Original-Change-Id: I200ace750dbe3c8d99f792d70a85b2ebd4e5b0ce
Original-Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/c/flashrom/+/51115
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
(cherry picked from commit 9635cb4d9115dc5abac36ea77a443714f045beb6)
Change-Id: I914e710da0bd1282e69fc834297fe29f0b3fffa8
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/2772510
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Auto-Submit: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
diff --git a/usb_device.c b/usb_device.c
index 344c4cb..5a468dd 100644
--- a/usb_device.c
+++ b/usb_device.c
@@ -224,12 +224,12 @@
ret = LIBUSB(libusb_get_device_descriptor(list[i],
&descriptor));
- if (ret != 0) {
- msg_perr("USB: Failed to get device descriptor");
- free(*devices);
- *devices = NULL;
- return ret;
- }
+ if (ret != 0) {
+ msg_perr("USB: Failed to get device descriptor");
+ free(*devices);
+ *devices = NULL;
+ return ret;
+ }
if (check_match(&match->vid, descriptor.idVendor) &&
check_match(&match->pid, descriptor.idProduct) &&
@@ -279,8 +279,8 @@
ret = usb_device_open(device);
if (ret != 0) {
- msg_perr("USB: Failed to open device\n");
- return ret;
+ msg_perr("USB: Failed to open device\n");
+ return ret;
}
ret = LIBUSB(libusb_get_device_descriptor(device->device, &descriptor));
diff --git a/usb_device.h b/usb_device.h
index 4abf751..8b7a801 100644
--- a/usb_device.h
+++ b/usb_device.h
@@ -41,21 +41,21 @@
* flashrom recognizes. It also displays additional libusb specific
* information about the failure.
*/
-#define LIBUSB(expression) \
- ({ \
- int libusb_error__ = (expression); \
+#define LIBUSB(expression) \
+ ({ \
+ int libusb_error__ = (expression); \
\
- if (libusb_error__ < 0) { \
- msg_perr("libusb error: %s:%d %s\n", \
- __FILE__, \
- __LINE__, \
- libusb_error_name(libusb_error__)); \
+ if (libusb_error__ < 0) { \
+ msg_perr("libusb error: %s:%d %s\n", \
+ __FILE__, \
+ __LINE__, \
+ libusb_error_name(libusb_error__)); \
libusb_error__ = LIBUSB_ERROR(libusb_error__); \
- } else { \
- libusb_error__ = 0; \
- } \
+ } else { \
+ libusb_error__ = 0; \
+ } \
\
- libusb_error__; \
+ libusb_error__; \
})
/*
@@ -64,7 +64,7 @@
*/
static inline bool usb_device_is_libusb_error(int error_code)
{
- return (0x20000 <= error_code && error_code < 0x20064);
+ return (0x20000 <= error_code && error_code < 0x20064);
}
/*
