X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Fnand%2Fmx2.c;h=42bb0720f131ba2900d302c9a39a6b74ec5fc0d3;hb=b0759dfc538b973cce67df93f8a7fe239bfb4c74;hp=83e1cb1ce7c01c4a17073dbe06c30f39a4a0efc1;hpb=f40faeb349e417e566bf100aa08a9246501a82c5;p=openocd.git

diff --git a/src/flash/nand/mx2.c b/src/flash/nand/mx2.c
index 83e1cb1ce7..42bb0720f1 100644
--- a/src/flash/nand/mx2.c
+++ b/src/flash/nand/mx2.c
@@ -61,7 +61,7 @@ static const char sram_buffer_bounds_err_msg[] =
 	"trying to access out of SRAM buffer bound (addr=0x%" PRIx32 ")";
 static const char get_status_register_err_msg[] = "can't get NAND status";
 static uint32_t in_sram_address;
-unsigned char sign_of_sequental_byte_read;
+static unsigned char sign_of_sequental_byte_read;
 
 static int initialize_nf_controller(struct nand_device *nand);
 static int get_next_byte_from_sram_buffer(struct target * target, uint8_t * value);
@@ -73,7 +73,6 @@ static int do_data_output(struct nand_device *nand);
 
 static int imx27_command(struct nand_device *nand, uint8_t command);
 static int imx27_address(struct nand_device *nand, uint8_t address);
-static int imx27_controller_ready(struct nand_device *nand, int tout);
 
 NAND_DEVICE_COMMAND_HANDLER(imx27_nand_device_command)
 {
@@ -229,11 +228,6 @@ static int imx27_write_data(struct nand_device *nand, uint16_t data)
 	return ERROR_NAND_OPERATION_FAILED;
 }
 
-static int imx27_nand_ready(struct nand_device *nand, int timeout)
-{
-	return imx27_controller_ready(nand, timeout);
-}
-
 static int imx27_reset(struct nand_device *nand)
 {
 	/*
@@ -342,7 +336,7 @@ static int imx27_address(struct nand_device *nand, uint8_t address)
 	return ERROR_OK;
 }
 
-static int imx27_controller_ready(struct nand_device *nand, int tout)
+static int imx27_nand_ready(struct nand_device *nand, int tout)
 {
 	uint16_t poll_complete_status;
 	struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
@@ -771,6 +765,5 @@ struct nand_flash_controller imx27_nand_flash_controller = {
 	.read_data		= &imx27_read_data,
 	.write_page		= &imx27_write_page,
 	.read_page		= &imx27_read_page,
-	.controller_ready	= &imx27_controller_ready,
 	.nand_ready		= &imx27_nand_ready,
 };