sf: ops: Unify read_ops bank configuration

Unified the bar code from read_ops into a spi_flash_bar() Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>

sf: ops: Unify read_ops bank configuration
Unified the bar code from read_ops into a spi_flash_bar() Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Jagannadha Sutradharudu Teki
1 parent 2ba863fae6
Showing 1 changed file with 5 additions and 8 deletions Side-by-side Diff
drivers/mtd/spi/sf_ops.c
@@ -127,7 +127,7 @@
 		return ret;
 	}
  
-	return 0;
+	return bank_sel;
 }
 #endif
  
  
@@ -321,8 +321,9 @@
 int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
 		size_t len, void *data)
 {
-	u8 *cmd, cmdsz, bank_sel = 0;
+	u8 *cmd, cmdsz;
 	u32 remain_len, read_len;
+	int bank_sel = 0;
 	int ret = -1;
  
 	/* Handle memory-mapped SPI */
  
@@ -346,13 +347,9 @@
 	cmd[0] = flash->read_cmd;
 	while (len) {
 #ifdef CONFIG_SPI_FLASH_BAR
-		bank_sel = offset / SPI_FLASH_16MB_BOUN;
-
-		ret = spi_flash_cmd_bankaddr_write(flash, bank_sel);
-		if (ret) {
-			debug("SF: fail to set bank%d\n", bank_sel);
+		bank_sel = spi_flash_bank(flash, offset);
+		if (bank_sel < 0)
 			return ret;
-		}
 #endif
 		remain_len = (SPI_FLASH_16MB_BOUN * (bank_sel + 1)) - offset;
 		if (len < remain_len)
...	...	@@ -127,7 +127,7 @@
127	127	return ret;
128	128	}
129	129
130		- return 0;
	130	+ return bank_sel;
131	131	}
132	132	#endif
133	133
134	134
...	...	@@ -321,8 +321,9 @@
321	321	int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
322	322	size_t len, void *data)
323	323	{
324		- u8 *cmd, cmdsz, bank_sel = 0;
	324	+ u8 *cmd, cmdsz;
325	325	u32 remain_len, read_len;
	326	+ int bank_sel = 0;
326	327	int ret = -1;
327	328
328	329	/* Handle memory-mapped SPI */
329	330
...	...	@@ -346,13 +347,9 @@
346	347	cmd[0] = flash->read_cmd;
347	348	while (len) {
348	349	#ifdef CONFIG_SPI_FLASH_BAR
349		- bank_sel = offset / SPI_FLASH_16MB_BOUN;
350		-
351		- ret = spi_flash_cmd_bankaddr_write(flash, bank_sel);
352		- if (ret) {
353		- debug("SF: fail to set bank%d\n", bank_sel);
	350	+ bank_sel = spi_flash_bank(flash, offset);
	351	+ if (bank_sel < 0)
354	352	return ret;
355		- }
356	353	#endif
357	354	remain_len = (SPI_FLASH_16MB_BOUN * (bank_sel + 1)) - offset;
358	355	if (len < remain_len)