From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 20 Jul 2014 13:14:13 +0000 (+0200)
Subject: Staging: bcm: nvm.c: replaced member accessing with variable
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ae5ad41993eb5b7a40b077fc1b4762481fcd3a3e;p=openwrt%2Fstaging%2Fblogic.git

Staging: bcm: nvm.c: replaced member accessing with variable

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index c38c80347c19..0d197c0855db 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -1042,6 +1042,8 @@ static int bulk_read_complete_sector(struct bcm_mini_adapter *ad,
 {
 	unsigned int j;
 	int bulk_read_stat;
+	FP_FLASH_WRITE_STATUS writef =
+		ad->fpFlashWriteWithStatusCheck;
 
 	for (i = 0; i < ad->uiSectorSize; i += MAX_RW_SIZE) {
 		bulk_read_stat = BeceemFlashBulkRead(ad,
@@ -1054,14 +1056,14 @@ static int bulk_read_complete_sector(struct bcm_mini_adapter *ad,
 
 		if (ad->ulFlashWriteSize == 1) {
 			for (j = 0; j < 16; j++) {
-				if ((read_bk[j] != tmpbuff[i+j]) &&
-				    (STATUS_SUCCESS != (*ad->fpFlashWriteWithStatusCheck)(ad, partoff + i + j, &tmpbuff[i+j]))) {
+				if ((read_bk[j] != tmpbuff[i + j]) &&
+				    (STATUS_SUCCESS != (*writef)(ad, partoff + i + j, &tmpbuff[i + j]))) {
 					return STATUS_FAILURE;
 				}
 			}
 		} else {
 			if ((memcmp(read_bk, &tmpbuff[i], MAX_RW_SIZE)) &&
-			    ((STATUS_SUCCESS != (*ad->fpFlashWriteWithStatusCheck)(ad, partoff + i, &tmpbuff[i])))) {
+			    (STATUS_SUCCESS != (*writef)(ad, partoff + i, &tmpbuff[i]))) {
 				return STATUS_FAILURE;
 			}
 		}