Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 15:37:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

sf: sst: inline duplicate write enable helper funcs

Browse source 
The local sst enable/disable write funcs don't really add anything
over the common API, so just inline the common calls directly.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2012-03-04 23:12:23 -05:00
parent 04a3e90eaf
commit 7a6d2a7ec1
1 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/mtd/spi/sst.c
View file

@ -93,24 +93,6 @@ static const struct sst_spi_flash_params sst_spi_flash_table[] = {
}, },
}; };
static int
sst_enable_writing(struct spi_flash *flash)
{
int ret = spi_flash_cmd_write_enable(flash);
if (ret)
debug("SF: Enabling Write failed\n");
return ret;
}
static int
sst_disable_writing(struct spi_flash *flash)
{
int ret = spi_flash_cmd_write_disable(flash);
if (ret)
debug("SF: Disabling Write failed\n");
return ret;
}
static int static int
sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf) sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
{ {
@ -125,7 +107,7 @@ sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
debug("BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n", debug("BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
spi_w8r8(flash->spi, CMD_READ_STATUS), buf, cmd[0], offset); spi_w8r8(flash->spi, CMD_READ_STATUS), buf, cmd[0], offset);
ret = sst_enable_writing(flash); ret = spi_flash_cmd_write_enable(flash);
if (ret) if (ret)
return ret; return ret;
@ -158,7 +140,7 @@ sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
} }
offset += actual; offset += actual;
ret = sst_enable_writing(flash); ret = spi_flash_cmd_write_enable(flash);
if (ret) if (ret)
goto done; goto done;
@ -189,7 +171,7 @@ sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
} }
if (!ret) if (!ret)
ret = sst_disable_writing(flash); ret = spi_flash_cmd_write_disable(flash);
/* If there is a single trailing byte, write it out */ /* If there is a single trailing byte, write it out */
if (!ret && actual != len) if (!ret && actual != len)
@ -209,7 +191,7 @@ sst_unlock(struct spi_flash *flash)
int ret; int ret;
u8 cmd, status; u8 cmd, status;
ret = sst_enable_writing(flash); ret = spi_flash_cmd_write_enable(flash);
if (ret) if (ret)
return ret; return ret;