nand: rename device to nand

[openocd.git] / src / flash / s3c2443_nand.c

diff --git a/src/flash/s3c2443_nand.c b/src/flash/s3c2443_nand.c
index a50689d593fdd8caad026579dfb79ed156c7869a..82d9b8eae7bb743b05f2dc0175eaed22aca6ac5e 100644 (file)
--- a/src/flash/s3c2443_nand.c
+++ b/src/flash/s3c2443_nand.c
@@ -31,35 +31,13 @@
 #include "s3c24xx_nand.h"
 
 
-static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
-static int s3c2443_init(struct nand_device_s *device);
-
-nand_flash_controller_t s3c2443_nand_controller =
-{
-       .name                   = "s3c2443",
-       .nand_device_command    = s3c2443_nand_device_command,
-       .register_commands      = s3c24xx_register_commands,
-       .init                   = s3c2443_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,
-};
-
 static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
                                char **args, int argc,
-                               struct nand_device_s *device)
+                               struct nand_device_s *nand)
 {
        s3c24xx_nand_controller_t *info;
 
-       info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device);
+       info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
        if (info == NULL) {
                return ERROR_NAND_DEVICE_INVALID;
        }
@@ -73,9 +51,9 @@ static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *
        return ERROR_OK;
 }
 
-static int s3c2443_init(struct nand_device_s *device)
+static int s3c2443_init(struct nand_device_s *nand)
 {
-       s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
+       s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
        target_t *target = s3c24xx_info->target;
 
        target_write_u32(target, S3C2410_NFCONF,
@@ -89,3 +67,21 @@ static int s3c2443_init(struct nand_device_s *device)
 
        return ERROR_OK;
 }
+
+nand_flash_controller_t s3c2443_nand_controller = {
+               .name = "s3c2443",
+               .nand_device_command = &s3c2443_nand_device_command,
+               .register_commands = &s3c24xx_register_commands,
+               .init = &s3c2443_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,
+       };