From 469146c0977436c0803590ef6a0de368cab5b946 Mon Sep 17 00:00:00 2001 From: Jagannadha Sutradharudu Teki Date: Thu, 10 Oct 2013 22:14:09 +0530 Subject: sf: Minor cleanups. - Add comments. - Renamed few macros. - Add tabs. Signed-off-by: Jagannadha Sutradharudu Teki Signed-off-by: Bo Shen --- drivers/mtd/spi/sf_internal.h | 6 +++--- drivers/mtd/spi/sf_ops.c | 2 +- drivers/mtd/spi/sf_probe.c | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'drivers/mtd/spi') diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 12d02f9..ad044ee 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -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_ */ diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 1003038..dde6231 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -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 diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 4251b1b..9bb5a5f 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -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; -- cgit v1.1