@@ -310,9 +310,6 @@ struct brcmnand_host {
310
310
struct platform_device * pdev ;
311
311
int cs ;
312
312
313
- unsigned int last_cmd ;
314
- unsigned int last_byte ;
315
- u64 last_addr ;
316
313
struct brcmnand_cfg hwcfg ;
317
314
struct brcmnand_controller * ctrl ;
318
315
};
@@ -2233,14 +2230,11 @@ static int brcmnand_read_page(struct nand_chip *chip, uint8_t *buf,
2233
2230
int oob_required , int page )
2234
2231
{
2235
2232
struct mtd_info * mtd = nand_to_mtd (chip );
2236
- struct brcmnand_host * host = nand_get_controller_data (chip );
2237
2233
u8 * oob = oob_required ? (u8 * )chip -> oob_poi : NULL ;
2238
2234
u64 addr = (u64 )page << chip -> page_shift ;
2239
2235
2240
- host -> last_addr = addr ;
2241
-
2242
- return brcmnand_read (mtd , chip , host -> last_addr ,
2243
- mtd -> writesize >> FC_SHIFT , (u32 * )buf , oob );
2236
+ return brcmnand_read (mtd , chip , addr , mtd -> writesize >> FC_SHIFT ,
2237
+ (u32 * )buf , oob );
2244
2238
}
2245
2239
2246
2240
static int brcmnand_read_page_raw (struct nand_chip * chip , uint8_t * buf ,
@@ -2252,11 +2246,9 @@ static int brcmnand_read_page_raw(struct nand_chip *chip, uint8_t *buf,
2252
2246
int ret ;
2253
2247
u64 addr = (u64 )page << chip -> page_shift ;
2254
2248
2255
- host -> last_addr = addr ;
2256
-
2257
2249
brcmnand_set_ecc_enabled (host , 0 );
2258
- ret = brcmnand_read (mtd , chip , host -> last_addr ,
2259
- mtd -> writesize >> FC_SHIFT , (u32 * )buf , oob );
2250
+ ret = brcmnand_read (mtd , chip , addr , mtd -> writesize >> FC_SHIFT ,
2251
+ (u32 * )buf , oob );
2260
2252
brcmnand_set_ecc_enabled (host , 1 );
2261
2253
return ret ;
2262
2254
}
@@ -2363,13 +2355,10 @@ static int brcmnand_write_page(struct nand_chip *chip, const uint8_t *buf,
2363
2355
int oob_required , int page )
2364
2356
{
2365
2357
struct mtd_info * mtd = nand_to_mtd (chip );
2366
- struct brcmnand_host * host = nand_get_controller_data (chip );
2367
2358
void * oob = oob_required ? chip -> oob_poi : NULL ;
2368
2359
u64 addr = (u64 )page << chip -> page_shift ;
2369
2360
2370
- host -> last_addr = addr ;
2371
-
2372
- return brcmnand_write (mtd , chip , host -> last_addr , (const u32 * )buf , oob );
2361
+ return brcmnand_write (mtd , chip , addr , (const u32 * )buf , oob );
2373
2362
}
2374
2363
2375
2364
static int brcmnand_write_page_raw (struct nand_chip * chip , const uint8_t * buf ,
@@ -2381,9 +2370,8 @@ static int brcmnand_write_page_raw(struct nand_chip *chip, const uint8_t *buf,
2381
2370
u64 addr = (u64 )page << chip -> page_shift ;
2382
2371
int ret = 0 ;
2383
2372
2384
- host -> last_addr = addr ;
2385
2373
brcmnand_set_ecc_enabled (host , 0 );
2386
- ret = brcmnand_write (mtd , chip , host -> last_addr , (const u32 * )buf , oob );
2374
+ ret = brcmnand_write (mtd , chip , addr , (const u32 * )buf , oob );
2387
2375
brcmnand_set_ecc_enabled (host , 1 );
2388
2376
2389
2377
return ret ;
0 commit comments