[PATCH] firmware: Coding style issue

From: Kerim Gueney
Date: Sat May 10 2014 - 17:02:24 EST


Janitorial cleanup of 11 or so (coding style) errors
---
firmware/ihex2fw.c | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/firmware/ihex2fw.c b/firmware/ihex2fw.c
index cf38e15..e6f8bb4 100644
--- a/firmware/ihex2fw.c
+++ b/firmware/ihex2fw.c
@@ -26,9 +26,9 @@

struct ihex_binrec {
struct ihex_binrec *next; /* not part of the real data structure */
- uint32_t addr;
- uint16_t len;
- uint8_t data[];
+ uint32_t addr;
+ uint16_t len;
+ uint8_t data[];
};

/**
@@ -36,31 +36,33 @@ struct ihex_binrec {
**/
static uint8_t nybble(const uint8_t n)
{
- if (n >= '0' && n <= '9') return n - '0';
- else if (n >= 'A' && n <= 'F') return n - ('A' - 10);
- else if (n >= 'a' && n <= 'f') return n - ('a' - 10);
- return 0;
+ if (n >= '0' && n <= '9')
+ return n - '0';
+ else if (n >= 'A' && n <= 'F')
+ return n - ('A' - 10);
+ else if (n >= 'a' && n <= 'f')
+ return n - ('a' - 10);
+ return 0;
}

static uint8_t hex(const uint8_t *data, uint8_t *crc)
{
- uint8_t val = (nybble(data[0]) << 4) | nybble(data[1]);
- *crc += val;
- return val;
+ uint8_t val = (nybble(data[0]) << 4) | nybble(data[1]);
+ *crc += val;
+ return val;
}

static int process_ihex(uint8_t *data, ssize_t size);
static void file_record(struct ihex_binrec *record);
static int output_records(int outfd);

-static int sort_records = 0;
-static int wide_records = 0;
-static int include_jump = 0;
+static int sort_records;
+static int wide_records;
+static int include_jump;

static int usage(void)
{
- fprintf(stderr, "ihex2fw: Convert ihex files into binary "
- "representation for use by Linux kernel\n");
+ fprintf(stderr, "ihex2fw: Convert ihex files into binary representation for use by Linux kernel\n");
fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
fprintf(stderr, " -w: wide records (16-bit length)\n");
fprintf(stderr, " -s: sort records by address\n");
@@ -141,8 +143,10 @@ static int process_ihex(uint8_t *data, ssize_t size)
next_record:
/* search for the start of record character */
while (i < size) {
- if (data[i] == '\n') line++;
- if (data[i++] == ':') break;
+ if (data[i] == '\n')
+ line++;
+ if (data[i++] == ':')
+ break;
}

/* Minimum record length would be about 10 characters */
--
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/