|
@@ -141,7 +141,7 @@ static int dataflash_waitready(struct spi_device *spi)
|
|
*/
|
|
*/
|
|
static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
|
|
static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
|
|
{
|
|
{
|
|
- struct dataflash *priv = (struct dataflash *)mtd->priv;
|
|
|
|
|
|
+ struct dataflash *priv = mtd->priv;
|
|
struct spi_device *spi = priv->spi;
|
|
struct spi_device *spi = priv->spi;
|
|
struct spi_transfer x = { .tx_dma = 0, };
|
|
struct spi_transfer x = { .tx_dma = 0, };
|
|
struct spi_message msg;
|
|
struct spi_message msg;
|
|
@@ -231,7 +231,7 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
|
|
static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len,
|
|
static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len,
|
|
size_t *retlen, u_char *buf)
|
|
size_t *retlen, u_char *buf)
|
|
{
|
|
{
|
|
- struct dataflash *priv = (struct dataflash *)mtd->priv;
|
|
|
|
|
|
+ struct dataflash *priv = mtd->priv;
|
|
struct spi_transfer x[2] = { { .tx_dma = 0, }, };
|
|
struct spi_transfer x[2] = { { .tx_dma = 0, }, };
|
|
struct spi_message msg;
|
|
struct spi_message msg;
|
|
unsigned int addr;
|
|
unsigned int addr;
|
|
@@ -304,7 +304,7 @@ static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len,
|
|
static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
|
|
static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
|
|
size_t * retlen, const u_char * buf)
|
|
size_t * retlen, const u_char * buf)
|
|
{
|
|
{
|
|
- struct dataflash *priv = (struct dataflash *)mtd->priv;
|
|
|
|
|
|
+ struct dataflash *priv = mtd->priv;
|
|
struct spi_device *spi = priv->spi;
|
|
struct spi_device *spi = priv->spi;
|
|
struct spi_transfer x[2] = { { .tx_dma = 0, }, };
|
|
struct spi_transfer x[2] = { { .tx_dma = 0, }, };
|
|
struct spi_message msg;
|
|
struct spi_message msg;
|
|
@@ -515,7 +515,7 @@ static ssize_t otp_read(struct spi_device *spi, unsigned base,
|
|
static int dataflash_read_fact_otp(struct mtd_info *mtd,
|
|
static int dataflash_read_fact_otp(struct mtd_info *mtd,
|
|
loff_t from, size_t len, size_t *retlen, u_char *buf)
|
|
loff_t from, size_t len, size_t *retlen, u_char *buf)
|
|
{
|
|
{
|
|
- struct dataflash *priv = (struct dataflash *)mtd->priv;
|
|
|
|
|
|
+ struct dataflash *priv = mtd->priv;
|
|
int status;
|
|
int status;
|
|
|
|
|
|
/* 64 bytes, from 0..63 ... start at 64 on-chip */
|
|
/* 64 bytes, from 0..63 ... start at 64 on-chip */
|
|
@@ -532,7 +532,7 @@ static int dataflash_read_fact_otp(struct mtd_info *mtd,
|
|
static int dataflash_read_user_otp(struct mtd_info *mtd,
|
|
static int dataflash_read_user_otp(struct mtd_info *mtd,
|
|
loff_t from, size_t len, size_t *retlen, u_char *buf)
|
|
loff_t from, size_t len, size_t *retlen, u_char *buf)
|
|
{
|
|
{
|
|
- struct dataflash *priv = (struct dataflash *)mtd->priv;
|
|
|
|
|
|
+ struct dataflash *priv = mtd->priv;
|
|
int status;
|
|
int status;
|
|
|
|
|
|
/* 64 bytes, from 0..63 ... start at 0 on-chip */
|
|
/* 64 bytes, from 0..63 ... start at 0 on-chip */
|
|
@@ -553,7 +553,7 @@ static int dataflash_write_user_otp(struct mtd_info *mtd,
|
|
const size_t l = 4 + 64;
|
|
const size_t l = 4 + 64;
|
|
uint8_t *scratch;
|
|
uint8_t *scratch;
|
|
struct spi_transfer t;
|
|
struct spi_transfer t;
|
|
- struct dataflash *priv = (struct dataflash *)mtd->priv;
|
|
|
|
|
|
+ struct dataflash *priv = mtd->priv;
|
|
int status;
|
|
int status;
|
|
|
|
|
|
if (len > 64)
|
|
if (len > 64)
|