NAND/S3CXXXX: remove private "target" copy
authorAntonio Borneo <borneo.antonio@gmail.com>
Fri, 31 Dec 2010 11:46:09 +0000 (19:46 +0800)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Sun, 2 Jan 2011 18:58:58 +0000 (19:58 +0100)
Remove "target" form private data, and use
common one in struct nand_block.

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
src/flash/nand/s3c2410.c
src/flash/nand/s3c2412.c
src/flash/nand/s3c2440.c
src/flash/nand/s3c2443.c
src/flash/nand/s3c24xx.c
src/flash/nand/s3c24xx.h
src/flash/nand/s3c6400.c

index 1827c74..e998f65 100644 (file)
@@ -46,8 +46,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c2410_nand_device_command)
 
 static int s3c2410_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,
                         S3C2410_NFCONF_EN | S3C2410_NFCONF_TACLS(3) |
@@ -58,8 +57,7 @@ static int s3c2410_init(struct nand_device *nand)
 
 static int s3c2410_write_data(struct nand_device *nand, uint16_t data)
 {
-       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
@@ -72,8 +70,7 @@ static int s3c2410_write_data(struct nand_device *nand, uint16_t data)
 
 static int s3c2410_read_data(struct nand_device *nand, void *data)
 {
-       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
@@ -86,8 +83,7 @@ static int s3c2410_read_data(struct nand_device *nand, void *data)
 
 static int s3c2410_nand_ready(struct nand_device *nand, int timeout)
 {
-       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
        uint8_t status;
 
        if (target->state != TARGET_HALTED) {
index f43f8a6..7f4357e 100644 (file)
@@ -46,8 +46,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c2412_nand_device_command)
 
 static int s3c2412_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) |
index 797ce24..4221f3d 100644 (file)
@@ -47,8 +47,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c2440_nand_device_command)
 
 static int s3c2440_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) |
@@ -64,7 +63,7 @@ static int s3c2440_init(struct nand_device *nand)
 int s3c2440_nand_ready(struct nand_device *nand, int timeout)
 {
        struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
        uint8_t status;
 
        if (target->state != TARGET_HALTED) {
@@ -90,7 +89,7 @@ int s3c2440_nand_ready(struct nand_device *nand, int timeout)
 int s3c2440_read_block_data(struct nand_device *nand, uint8_t *data, int data_size)
 {
        struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
        uint32_t nfdata = s3c24xx_info->data;
        uint32_t tmp;
 
@@ -126,7 +125,7 @@ int s3c2440_read_block_data(struct nand_device *nand, uint8_t *data, int data_si
 int s3c2440_write_block_data(struct nand_device *nand, uint8_t *data, int data_size)
 {
        struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
        uint32_t nfdata = s3c24xx_info->data;
        uint32_t tmp;
 
index 5fb2d92..8ad044c 100644 (file)
@@ -47,8 +47,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c2443_nand_device_command)
 
 static int s3c2443_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) |
index e3b5c2e..eb20f35 100644 (file)
@@ -43,13 +43,6 @@ S3C24XX_DEVICE_COMMAND()
        }
 
        nand->controller_priv = s3c24xx_info;
-
-       s3c24xx_info->target = get_target(CMD_ARGV[1]);
-       if (s3c24xx_info->target == NULL) {
-               LOG_ERROR("target '%s' not defined", CMD_ARGV[1]);
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-
        *info = s3c24xx_info;
 
        return ERROR_OK;
@@ -58,7 +51,7 @@ S3C24XX_DEVICE_COMMAND()
 int s3c24xx_reset(struct nand_device *nand)
 {
        struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
@@ -73,7 +66,7 @@ int s3c24xx_reset(struct nand_device *nand)
 int s3c24xx_command(struct nand_device *nand, uint8_t command)
 {
        struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
@@ -88,7 +81,7 @@ int s3c24xx_command(struct nand_device *nand, uint8_t command)
 int s3c24xx_address(struct nand_device *nand, uint8_t address)
 {
        struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
@@ -102,7 +95,7 @@ int s3c24xx_address(struct nand_device *nand, uint8_t address)
 int s3c24xx_write_data(struct nand_device *nand, uint16_t data)
 {
        struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
@@ -116,7 +109,7 @@ int s3c24xx_write_data(struct nand_device *nand, uint16_t data)
 int s3c24xx_read_data(struct nand_device *nand, void *data)
 {
        struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
index 059c84d..1535dec 100644 (file)
@@ -33,8 +33,6 @@
 
 struct s3c24xx_nand_controller
 {
-       struct target *target;
-
        /* register addresses */
        uint32_t                 cmd;
        uint32_t                 addr;
index 960447d..a6f8043 100644 (file)
@@ -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) |