diff options
Diffstat (limited to 'drivers/staging/greybus')
-rw-r--r-- | drivers/staging/greybus/Documentation/firmware/authenticate.c | 2 | ||||
-rw-r--r-- | drivers/staging/greybus/Documentation/firmware/firmware.c | 21 | ||||
-rw-r--r-- | drivers/staging/greybus/connection.c | 3 | ||||
-rw-r--r-- | drivers/staging/greybus/gbphy.c | 1 | ||||
-rw-r--r-- | drivers/staging/greybus/light.c | 1 | ||||
-rw-r--r-- | drivers/staging/greybus/loopback.c | 5 | ||||
-rw-r--r-- | drivers/staging/greybus/tools/loopback_test.c | 6 | ||||
-rw-r--r-- | drivers/staging/greybus/uart.c | 3 |
8 files changed, 20 insertions, 22 deletions
diff --git a/drivers/staging/greybus/Documentation/firmware/authenticate.c b/drivers/staging/greybus/Documentation/firmware/authenticate.c index ab0688a..b836f0a 100644 --- a/drivers/staging/greybus/Documentation/firmware/authenticate.c +++ b/drivers/staging/greybus/Documentation/firmware/authenticate.c @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) goto close_fd; } - printf("UID received: 0x%llx\n", *(long long unsigned int *)(uid.uid)); + printf("UID received: 0x%llx\n", *(unsigned long long int *)(uid.uid)); /* Get certificate */ printf("Get IMS certificate\n"); diff --git a/drivers/staging/greybus/Documentation/firmware/firmware.c b/drivers/staging/greybus/Documentation/firmware/firmware.c index ff93824..c73dee9 100644 --- a/drivers/staging/greybus/Documentation/firmware/firmware.c +++ b/drivers/staging/greybus/Documentation/firmware/firmware.c @@ -52,6 +52,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <unistd.h> #include <sys/ioctl.h> @@ -64,12 +65,12 @@ #define FW_TAG_INT_DEFAULT "s3f" #define FW_TAG_BCND_DEFAULT "bf_01" #define FW_UPDATE_TYPE_DEFAULT 0 -#define FW_TIMEOUT_DEFAULT 10000; +#define FW_TIMEOUT_DEFAULT 10000 static const char *firmware_tag; static const char *fwdev = FW_DEV_DEFAULT; -static int fw_update_type = FW_UPDATE_TYPE_DEFAULT; -static int fw_timeout = FW_TIMEOUT_DEFAULT; +static unsigned int fw_update_type = FW_UPDATE_TYPE_DEFAULT; +static unsigned int fw_timeout = FW_TIMEOUT_DEFAULT; static struct fw_mgmt_ioc_get_intf_version intf_fw_info; static struct fw_mgmt_ioc_get_backend_version backend_fw_info; @@ -204,6 +205,7 @@ retry_fw_update: int main(int argc, char *argv[]) { int fd, ret; + char *endptr; if (argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))) { @@ -215,20 +217,19 @@ int main(int argc, char *argv[]) fwdev = argv[1]; if (argc > 2) - sscanf(argv[2], "%u", &fw_update_type); + fw_update_type = strtoul(argv[2], &endptr, 10); - if (argc > 3) { + if (argc > 3) firmware_tag = argv[3]; - } else if (!fw_update_type) { + else if (!fw_update_type) firmware_tag = FW_TAG_INT_DEFAULT; - } else { + else firmware_tag = FW_TAG_BCND_DEFAULT; - } if (argc > 4) - sscanf(argv[4], "%u", &fw_timeout); + fw_timeout = strtoul(argv[4], &endptr, 10); - printf("Trying Firmware update: fwdev: %s, type: %s, tag: %s, timeout: %d\n", + printf("Trying Firmware update: fwdev: %s, type: %s, tag: %s, timeout: %u\n", fwdev, fw_update_type == 0 ? "interface" : "backend", firmware_tag, fw_timeout); diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c index 1bf0ee4..2cf6464 100644 --- a/drivers/staging/greybus/connection.c +++ b/drivers/staging/greybus/connection.c @@ -366,6 +366,9 @@ static int gb_connection_hd_cport_quiesce(struct gb_connection *connection) if (connection->mode_switch) peer_space += sizeof(struct gb_operation_msg_hdr); + if (!hd->driver->cport_quiesce) + return 0; + ret = hd->driver->cport_quiesce(hd, connection->hd_cport_id, peer_space, GB_CONNECTION_CPORT_QUIESCE_TIMEOUT); diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c index 64a1eb9..603de6f 100644 --- a/drivers/staging/greybus/gbphy.c +++ b/drivers/staging/greybus/gbphy.c @@ -11,7 +11,6 @@ #include <linux/types.h> #include <linux/module.h> -#include <linux/moduleparam.h> #include <linux/kernel.h> #include <linux/slab.h> #include <linux/device.h> diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index 8dffd8a..1681362 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -12,7 +12,6 @@ #include <linux/led-class-flash.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/version.h> #include <media/v4l2-flash-led-class.h> #include "greybus.h" diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index aaf29a5..08e2558 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -365,11 +365,8 @@ static void gb_loopback_calculate_stats(struct gb_loopback *gb, bool error); static u32 gb_loopback_nsec_to_usec_latency(u64 elapsed_nsecs) { - u32 lat; - do_div(elapsed_nsecs, NSEC_PER_USEC); - lat = elapsed_nsecs; - return lat; + return elapsed_nsecs; } static u64 __gb_loopback_calc_latency(u64 t1, u64 t2) diff --git a/drivers/staging/greybus/tools/loopback_test.c b/drivers/staging/greybus/tools/loopback_test.c index 18d7a3d..32a4369 100644 --- a/drivers/staging/greybus/tools/loopback_test.c +++ b/drivers/staging/greybus/tools/loopback_test.c @@ -476,7 +476,7 @@ int format_output(struct loopback_test *t, r->gbphy_firmware_latency_jitter); } else { - len += snprintf(&buf[len], buf_len- len, ",%s,%s,%u,%u,%u", + len += snprintf(&buf[len], buf_len - len, ",%s,%s,%u,%u,%u", t->test_name, dev_name, t->size, t->iteration_max, r->error); @@ -636,7 +636,7 @@ int find_loopback_devices(struct loopback_test *t) ret = 0; done: for (i = 0; i < n; i++) - free(namelist[n]); + free(namelist[i]); free(namelist); baddir: return ret; @@ -674,7 +674,7 @@ static int open_poll_files(struct loopback_test *t) err: for (i = 0; i < fds_idx; i++) - close(t->fds[fds_idx].fd); + close(t->fds[i].fd); return -1; } diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c index 43255e2..c6d01b8 100644 --- a/drivers/staging/greybus/uart.c +++ b/drivers/staging/greybus/uart.c @@ -23,7 +23,6 @@ #include <linux/serial.h> #include <linux/tty_driver.h> #include <linux/tty_flip.h> -#include <linux/serial.h> #include <linux/idr.h> #include <linux/fs.h> #include <linux/kdev_t.h> @@ -34,7 +33,7 @@ #include "greybus.h" #include "gbphy.h" -#define GB_NUM_MINORS 16 /* 16 is is more than enough */ +#define GB_NUM_MINORS 16 /* 16 is more than enough */ #define GB_NAME "ttyGB" #define GB_UART_WRITE_FIFO_SIZE PAGE_SIZE |