flash: nand: move in include file the declaration of 'nand_devices'

[openocd.git] / src / flash / nand / s3c2440.c

diff --git a/src/flash/nand/s3c2440.c b/src/flash/nand/s3c2440.c
index d1a421e3cf243d4467fad89f5bbd76170976fac5..789144cbdaaeeed97dcff996de92d333a90723da 100644 (file)
--- a/src/flash/nand/s3c2440.c
+++ b/src/flash/nand/s3c2440.c
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2007, 2008 by Ben Dooks                                 *
  *   ben@fluff.org                                                         *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
 /*
@@ -30,7 +17,6 @@
 
 #include "s3c24xx.h"
 
-
 NAND_DEVICE_COMMAND_HANDLER(s3c2440_nand_device_command)
 {
        struct s3c24xx_nand_controller *info;
@@ -47,8 +33,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 +49,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,11 +75,11 @@ 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;
 
-       LOG_INFO("%s: reading data: %p, %p, %d\n", __func__, nand, data, data_size);
+       LOG_INFO("%s: reading data: %p, %p, %d", __func__, nand, data, data_size);
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
@@ -126,7 +111,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;
 
@@ -154,18 +139,17 @@ int s3c2440_write_block_data(struct nand_device *nand, uint8_t *data, int data_s
 }
 
 struct nand_flash_controller s3c2440_nand_controller = {
-               .name = "s3c2440",
-               .nand_device_command = &s3c2440_nand_device_command,
-               .init = &s3c2440_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 = "s3c2440",
+       .nand_device_command = &s3c2440_nand_device_command,
+       .init = &s3c2440_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,
+};