ihex: Share code between ihex_validate_fw() and ihex_next_binrec()

Convert both ihex_validate_fw() and ihex_next_binrec() to use a helper
function to calculate next record offest. This way we only have one
place implementing next record offset calculation logic. No functional
change intended.

Cc: Chris Healy <cphealy@gmail.com>
Cc: Kyle McMartin <kyle@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/ihex.h b/include/linux/ihex.h
index 75c1943918693cc77a55d40c5e5f88887d3db72c..9c701521176b8c7abe0306ae2dde2d660ba9909b 100644 (file)
--- a/include/linux/ihex.h
+++ b/include/linux/ihex.h
@@ -23,29 +23,34 @@ struct ihex_binrec {
 
 /* Find the next record, taking into account the 4-byte alignment */
 static inline const struct ihex_binrec *
-ihex_next_binrec(const struct ihex_binrec *rec)
+__ihex_next_binrec(const struct ihex_binrec *rec)
 {
        int next = ((be16_to_cpu(rec->len) + 5) & ~3) - 2;
        rec = (void *)&rec->data[next];
 
+       return rec;
+}
+
+static inline const struct ihex_binrec *
+ihex_next_binrec(const struct ihex_binrec *rec)
+{
+       rec = __ihex_next_binrec(rec);
+
        return be16_to_cpu(rec->len) ? rec : NULL;
 }
 
 /* Check that ihex_next_binrec() won't take us off the end of the image... */
 static inline int ihex_validate_fw(const struct firmware *fw)
 {
-       const struct ihex_binrec *rec;
-       size_t ofs = 0;
+       const struct ihex_binrec *end, *rec;
 
-       while (ofs <= fw->size - sizeof(*rec)) {
-               rec = (void *)&fw->data[ofs];
+       rec = (const void *)fw->data;
+       end = (const void *)&fw->data[fw->size - sizeof(*end)];
 
+       for (; rec <= end; rec = __ihex_next_binrec(rec)) {
                /* Zero length marks end of records */
                if (!be16_to_cpu(rec->len))
                        return 0;
-
-               /* Point to next record... */
-               ofs += (sizeof(*rec) + be16_to_cpu(rec->len) + 3) & ~3;
        }
        return -EINVAL;
 }