usb:gadget:f_thor: code cleanup in function download_tail()
authorPrzemyslaw Marczak <p.marczak@samsung.com>
Fri, 18 Apr 2014 07:00:13 +0000 (09:00 +0200)
committerPrzemyslaw Marczak <p.marczak@samsung.com>
Fri, 25 Apr 2014 09:28:23 +0000 (11:28 +0200)
In thor's download_tail() function, dfu_get_entity() is called
before each dfu_write() call and the returned entity pointers
are the same. So dfu_get_entity() can be called just once and
this patch changes this.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
drivers/usb/gadget/f_thor.c

index 34cb94a5c77bdeff4d1aa97a5548715c5658bb9f..b5a199ae10010c425730c6e86d316b8e3c1bf8fe 100644 (file)
@@ -213,6 +213,7 @@ static long long int download_head(unsigned long long total,
 
 static int download_tail(long long int left, int cnt)
 {
+       struct dfu_entity *dfu_entity = dfu_get_entity(alt_setting_num);
        void *transfer_buffer = dfu_get_buf();
        int ret;
 
@@ -229,11 +230,10 @@ static int download_tail(long long int left, int cnt)
 #endif
 
        if (left) {
-               ret = dfu_write(dfu_get_entity(alt_setting_num),
-                               transfer_buffer, left, cnt++);
+               ret = dfu_write(dfu_entity, transfer_buffer, left, cnt++);
                if (ret) {
                        error("DFU write failed [%d]: left: %llu", ret, left);
-                       return ret;
+                       goto exit;
                }
        }
 
@@ -244,11 +244,11 @@ static int download_tail(long long int left, int cnt)
         * This also frees memory malloc'ed by dfu_get_buf(), so no explicit
         * need fo call dfu_free_buf() is needed.
         */
-       ret = dfu_write(dfu_get_entity(alt_setting_num),
-                       transfer_buffer, 0, cnt);
+       ret = dfu_write(dfu_entity, transfer_buffer, 0, cnt);
        if (ret)
                error("DFU write failed [%d] cnt: %d", ret, cnt);
 
+exit:
        return ret;
 }