Sometime in the past, nand_fileio_finish started to return ERROR_OK (with the value...

[fw/openocd] / src / flash / nand / s3c6400.c

diff --git a/src/flash/nand/s3c6400.c b/src/flash/nand/s3c6400.c
index 20b6cc17edd53559b882a8261beb3cd5f31682e9..6aa9c336c7c405bdc3ce48cc6f5dfdce437f0a71 100644 (file)
--- a/src/flash/nand/s3c6400.c
+++ b/src/flash/nand/s3c6400.c
@@ -43,8 +43,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c6400_nand_device_command)
 
 static int s3c6400_init(struct nand_device *nand)
 {
-       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
 
        target_write_u32(target, S3C2410_NFCONF,
                         S3C2440_NFCONF_TACLS(3) |
@@ -59,18 +58,17 @@ static int s3c6400_init(struct nand_device *nand)
 }
 
 struct nand_flash_controller s3c6400_nand_controller = {
-               .name = "s3c6400",
-               .nand_device_command = &s3c6400_nand_device_command,
-               .init = &s3c6400_init,
-               .reset = &s3c24xx_reset,
-               .command = &s3c24xx_command,
-               .address = &s3c24xx_address,
-               .write_data = &s3c24xx_write_data,
-               .read_data = &s3c24xx_read_data,
-               .write_page = s3c24xx_write_page,
-               .read_page = s3c24xx_read_page,
-               .write_block_data = &s3c2440_write_block_data,
-               .read_block_data = &s3c2440_read_block_data,
-               .controller_ready = &s3c24xx_controller_ready,
-               .nand_ready = &s3c2440_nand_ready,
-       };
+       .name = "s3c6400",
+       .nand_device_command = &s3c6400_nand_device_command,
+       .init = &s3c6400_init,
+       .reset = &s3c24xx_reset,
+       .command = &s3c24xx_command,
+       .address = &s3c24xx_address,
+       .write_data = &s3c24xx_write_data,
+       .read_data = &s3c24xx_read_data,
+       .write_page = s3c24xx_write_page,
+       .read_page = s3c24xx_read_page,
+       .write_block_data = &s3c2440_write_block_data,
+       .read_block_data = &s3c2440_read_block_data,
+       .nand_ready = &s3c2440_nand_ready,
+};