From da9a6826472b45cc58ba97b3cea58eb85bcbea1b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 24 Jun 2016 07:10:33 -0600 Subject: [PATCH] Trivial changes from review of PR --- canutils/canlib/Kconfig | 1 - canutils/canlib/canlib_getbaud.c | 2 +- canutils/canlib/canlib_getloopback.c | 2 +- canutils/canlib/canlib_getsilent.c | 2 +- canutils/canlib/canlib_setbaud.c | 7 ++++--- canutils/canlib/canlib_setloopback.c | 7 ++++--- canutils/canlib/canlib_setsilent.c | 7 ++++--- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/canutils/canlib/Kconfig b/canutils/canlib/Kconfig index 0eab8a07f..228a98544 100644 --- a/canutils/canlib/Kconfig +++ b/canutils/canlib/Kconfig @@ -14,4 +14,3 @@ config CANUTILS_CANLIB if CANUTILS_CANLIB endif - diff --git a/canutils/canlib/canlib_getbaud.c b/canutils/canlib/canlib_getbaud.c index 59cdc0d38..c123403a1 100644 --- a/canutils/canlib/canlib_getbaud.c +++ b/canutils/canlib/canlib_getbaud.c @@ -70,7 +70,7 @@ int canlib_getbaud(int fd, FAR int *bauds) struct canioc_bittiming_s timings; ret = ioctl(fd, CANIOC_GET_BITTIMING, (unsigned long)&timings); - if (ret!=OK) + if (ret != OK) { canerr("CANIOC_GET_BITTIMING failed, errno=%d\n", errno); return 0; diff --git a/canutils/canlib/canlib_getloopback.c b/canutils/canlib/canlib_getloopback.c index 7fa29f95c..ccff4ea4c 100644 --- a/canutils/canlib/canlib_getloopback.c +++ b/canutils/canlib/canlib_getloopback.c @@ -71,7 +71,7 @@ int canlib_getloopback(int fd, FAR bool *loopback) struct canioc_connmodes_s connmodes; ret = ioctl(fd, CANIOC_GET_CONNMODES, (unsigned long)&connmodes); - if (ret!=OK) + if (ret != OK) { canerr("CANIOC_GET_CONNMODES failed, errno=%d\n", errno); return FALSE; diff --git a/canutils/canlib/canlib_getsilent.c b/canutils/canlib/canlib_getsilent.c index 1e855e739..7b2eff1dc 100644 --- a/canutils/canlib/canlib_getsilent.c +++ b/canutils/canlib/canlib_getsilent.c @@ -71,7 +71,7 @@ int canlib_getsilent(int fd, FAR bool *silent) struct canioc_connmodes_s connmodes; ret = ioctl(fd, CANIOC_GET_CONNMODES, (unsigned long)&connmodes); - if (ret!=OK) + if (ret != OK) { canerr("CANIOC_GET_CONNMODES failed, errno=%d\n", errno); return FALSE; diff --git a/canutils/canlib/canlib_setbaud.c b/canutils/canlib/canlib_setbaud.c index 88998edd8..adb7804cb 100644 --- a/canutils/canlib/canlib_setbaud.c +++ b/canutils/canlib/canlib_setbaud.c @@ -70,18 +70,19 @@ int canlib_setbaud(int fd, int bauds) struct canioc_bittiming_s timings; ret = ioctl(fd, CANIOC_GET_BITTIMING, (unsigned long)&timings); - if (ret!=OK) + if (ret != OK) { canerr("CANIOC_GET_BITTIMING failed, errno=%d\n", errno); return ret; } timings.bt_baud = bauds; - ret = ioctl(fd, CANIOC_SET_BITTIMING, (unsigned long)&timings); - if (ret!=OK) + ret = ioctl(fd, CANIOC_SET_BITTIMING, (unsigned long)&timings); + if (ret != OK) { canerr("CANIOC_SET_BITTIMING failed, errno=%d\n", errno); } + return ret; } diff --git a/canutils/canlib/canlib_setloopback.c b/canutils/canlib/canlib_setloopback.c index 717568d8d..06e0822a5 100644 --- a/canutils/canlib/canlib_setloopback.c +++ b/canutils/canlib/canlib_setloopback.c @@ -72,18 +72,19 @@ int canlib_setloopback(int fd, bool loopback) struct canioc_connmodes_s connmodes; ret = ioctl(fd, CANIOC_GET_CONNMODES, (unsigned long)&connmodes); - if (ret!=OK) + if (ret != OK) { canerr("CANIOC_GET_CONNMODES failed, errno=%d\n", errno); return ret; } connmodes.bm_loopback = !!loopback; - ret = ioctl(fd, CANIOC_SET_CONNMODES, (unsigned long)&connmodes); - if (ret!=OK) + ret = ioctl(fd, CANIOC_SET_CONNMODES, (unsigned long)&connmodes); + if (ret != OK) { canerr("CANIOC_SET_CONNMODES failed, errno=%d\n", errno); } + return ret; } diff --git a/canutils/canlib/canlib_setsilent.c b/canutils/canlib/canlib_setsilent.c index 4f0376481..74629427e 100644 --- a/canutils/canlib/canlib_setsilent.c +++ b/canutils/canlib/canlib_setsilent.c @@ -72,18 +72,19 @@ int canlib_setsilent(int fd, bool silent) struct canioc_connmodes_s connmodes; ret = ioctl(fd, CANIOC_GET_CONNMODES, (unsigned long)&connmodes); - if (ret!=OK) + if (ret != OK) { canerr("CANIOC_GET_CONNMODES failed, errno=%d\n", errno); return ret; } connmodes.bm_silent = !!silent; - ret = ioctl(fd, CANIOC_SET_CONNMODES, (unsigned long)&connmodes); - if (ret!=OK) + ret = ioctl(fd, CANIOC_SET_CONNMODES, (unsigned long)&connmodes); + if (ret != OK) { canerr("CANIOC_SET_CONNMODES failed, errno=%d\n", errno); } + return ret; }