sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

sf: Minor cleanups. 

- Add comments.
- Renamed few macros.
- Add tabs.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Bo Shen <voice.shen@atmel.com>
This commit is contained in:
Jagannadha Sutradharudu Teki 2013-10-10 22:14:09 +05:30
parent 6152dd1528
commit 469146c097
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/spi/sf_internal.h
View File

@ -7,8 +7,8 @@
* Licensed under the GPL-2 or later.
*/
#ifndef _SPI_FLASH_INTERNAL_H_
#define _SPI_FLASH_INTERNAL_H_
#ifndef _SF_INTERNAL_H_
#define _SF_INTERNAL_H_
#define SPI_FLASH_16MB_BOUN 0x1000000
@ -139,4 +139,4 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
size_t len, void *data);
#endif /* _SPI_FLASH_INTERNAL_H_ */
#endif /* _SF_INTERNAL_H_ */

2
drivers/mtd/spi/sf_ops.c
View File

@ -292,7 +292,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
return ret;
}
#endif
remain_len = (SPI_FLASH_16MB_BOUN * (bank_sel + 1) - offset);
remain_len = (SPI_FLASH_16MB_BOUN * (bank_sel + 1)) - offset;
if (len < remain_len)
read_len = len;
else

5
drivers/mtd/spi/sf_probe.c
View File

@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
* @jedec: Device jedec ID (0x[1byte_manuf_id][2byte_dev_id])
* @ext_jedec: Device ext_jedec ID
* @sector_size: Sector size of this device
* @nr_sectors: No.of sectors on this device
* @nr_sectors: No.of sectors on this device
* @flags: Importent param, for flash specific behaviour
*/
struct spi_flash_params {
@ -139,7 +139,7 @@ static const struct spi_flash_params spi_flash_params_table[] = {
#endif
/*
* Note:
* Below paired flash devices has similar spi_flash_params params.
* Below paired flash devices has similar spi_flash params.
* (S25FL129P_64K, S25FL128S_64K)
* (W25Q80BL, W25Q80BV)
* (W25Q16CL, W25Q16DV)
@ -188,6 +188,7 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi,
}
memset(flash, '\0', sizeof(*flash));
/* Assign spi data */
flash->spi = spi;
flash->name = params->name;
flash->memory_map = spi->memory_map;

14
include/spi.h
View File

@ -1,4 +1,6 @@
/*
* Common SPI Interface: Controller-specific definitions
*
* (C) Copyright 2001
* Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com.
*
@ -8,8 +10,6 @@
#ifndef _SPI_H_
#define _SPI_H_
/* Controller-specific definitions: */
/* SPI mode flags */
#define SPI_CPHA 0x01 /* clock phase */
#define SPI_CPOL 0x02 /* clock polarity */
@ -241,11 +241,11 @@ static inline int spi_w8r8(struct spi_slave *slave, unsigned char byte)
* This calls spi_setup_slave() with the correct bus number. Call
* spi_free_slave() to free it later.
*
* @param blob Device tree blob
* @param node SPI peripheral node to use
* @param cs Chip select to use
* @param max_hz Maximum SCK rate in Hz (0 for default)
* @param mode Clock polarity, clock phase and other parameters
* @param blob: Device tree blob
* @param node: SPI peripheral node to use
* @param cs: Chip select to use
* @param max_hz: Maximum SCK rate in Hz (0 for default)
* @param mode: Clock polarity, clock phase and other parameters
* @return pointer to new spi_slave structure
*/
struct spi_slave *spi_setup_slave_fdt(const void *blob, int node,