Commit d91bb8d9 authored Aug 12, 2019 by Andrey Smirnov Committed by Wim Van Sebroeck Sep 17, 2019

watchdog: ziirave_wdt: Don't check if ihex record length is zero



Ihex_next_binrec() will return NULL if next record's 'len' is zero, so
explicit checks for that in the driver are unnecessary. Drop them.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Rick Ramstetter <rick@anteaterllc.com>
Cc: linux-watchdog@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20190812200906.31344-13-andrew.smirnov@gmail.com


Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

parent 08f980a8

drivers/watchdog/ziirave_wdt.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -318,10 +318,6 @@ static int ziirave_firm_verify(struct watchdog_device *wdd,
		u16 addr;

		for (rec = (void *)fw->data; rec; rec = ihex_next_binrec(rec)) {
		/* Zero length marks end of records */
		if (!be16_to_cpu(rec->len))
		break;

		addr = (be32_to_cpu(rec->addr) & 0xffff) >> 1;
		if (addr < ZIIRAVE_FIRM_FLASH_MEMORY_START \|\|
		addr > ZIIRAVE_FIRM_FLASH_MEMORY_END)
		@@ -381,10 +377,6 @@ static int ziirave_firm_upload(struct watchdog_device *wdd,
		msleep(500);

		for (rec = (void *)fw->data; rec; rec = ihex_next_binrec(rec)) {
		/* Zero length marks end of records */
		if (!be16_to_cpu(rec->len))
		break;

		ret = ziirave_firm_write_pkt(wdd, be32_to_cpu(rec->addr),
		rec->data, be16_to_cpu(rec->len));
		if (ret)