Commit a5602146 authored by Vijay Kumar's avatar Vijay Kumar Committed by David Woodhouse

[MTD] NAND: nandsim coding style fix

Removes line break after return type in function definitions, to be
consistent with the Linux coding style.
Signed-off-by: default avatarVijay Kumar <vijaykumar@bravegnu.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent d086d436
...@@ -349,8 +349,7 @@ static u_char ns_verify_buf[NS_LARGEST_PAGE_SIZE]; ...@@ -349,8 +349,7 @@ static u_char ns_verify_buf[NS_LARGEST_PAGE_SIZE];
* *
* RETURNS: 0 if success, -ENOMEM if memory alloc fails. * RETURNS: 0 if success, -ENOMEM if memory alloc fails.
*/ */
static int static int alloc_device(struct nandsim *ns)
alloc_device(struct nandsim *ns)
{ {
int i; int i;
...@@ -369,8 +368,7 @@ alloc_device(struct nandsim *ns) ...@@ -369,8 +368,7 @@ alloc_device(struct nandsim *ns)
/* /*
* Free any allocated pages, and free the array of page pointers. * Free any allocated pages, and free the array of page pointers.
*/ */
static void static void free_device(struct nandsim *ns)
free_device(struct nandsim *ns)
{ {
int i; int i;
...@@ -388,8 +386,7 @@ free_device(struct nandsim *ns) ...@@ -388,8 +386,7 @@ free_device(struct nandsim *ns)
* *
* RETURNS: 0 if success, -ERRNO if failure. * RETURNS: 0 if success, -ERRNO if failure.
*/ */
static int static int init_nandsim(struct mtd_info *mtd)
init_nandsim(struct mtd_info *mtd)
{ {
struct nand_chip *chip = (struct nand_chip *)mtd->priv; struct nand_chip *chip = (struct nand_chip *)mtd->priv;
struct nandsim *ns = (struct nandsim *)(chip->priv); struct nandsim *ns = (struct nandsim *)(chip->priv);
...@@ -505,8 +502,7 @@ init_nandsim(struct mtd_info *mtd) ...@@ -505,8 +502,7 @@ init_nandsim(struct mtd_info *mtd)
/* /*
* Free the nandsim structure. * Free the nandsim structure.
*/ */
static void static void free_nandsim(struct nandsim *ns)
free_nandsim(struct nandsim *ns)
{ {
kfree(ns->buf.byte); kfree(ns->buf.byte);
free_device(ns); free_device(ns);
...@@ -517,8 +513,7 @@ free_nandsim(struct nandsim *ns) ...@@ -517,8 +513,7 @@ free_nandsim(struct nandsim *ns)
/* /*
* Returns the string representation of 'state' state. * Returns the string representation of 'state' state.
*/ */
static char * static char *get_state_name(uint32_t state)
get_state_name(uint32_t state)
{ {
switch (NS_STATE(state)) { switch (NS_STATE(state)) {
case STATE_CMD_READ0: case STATE_CMD_READ0:
...@@ -576,8 +571,7 @@ get_state_name(uint32_t state) ...@@ -576,8 +571,7 @@ get_state_name(uint32_t state)
* *
* RETURNS: 1 if wrong command, 0 if right. * RETURNS: 1 if wrong command, 0 if right.
*/ */
static int static int check_command(int cmd)
check_command(int cmd)
{ {
switch (cmd) { switch (cmd) {
...@@ -603,8 +597,7 @@ check_command(int cmd) ...@@ -603,8 +597,7 @@ check_command(int cmd)
/* /*
* Returns state after command is accepted by command number. * Returns state after command is accepted by command number.
*/ */
static uint32_t static uint32_t get_state_by_command(unsigned command)
get_state_by_command(unsigned command)
{ {
switch (command) { switch (command) {
case NAND_CMD_READ0: case NAND_CMD_READ0:
...@@ -640,8 +633,7 @@ get_state_by_command(unsigned command) ...@@ -640,8 +633,7 @@ get_state_by_command(unsigned command)
/* /*
* Move an address byte to the correspondent internal register. * Move an address byte to the correspondent internal register.
*/ */
static inline void static inline void accept_addr_byte(struct nandsim *ns, u_char bt)
accept_addr_byte(struct nandsim *ns, u_char bt)
{ {
uint byte = (uint)bt; uint byte = (uint)bt;
...@@ -659,8 +651,7 @@ accept_addr_byte(struct nandsim *ns, u_char bt) ...@@ -659,8 +651,7 @@ accept_addr_byte(struct nandsim *ns, u_char bt)
/* /*
* Switch to STATE_READY state. * Switch to STATE_READY state.
*/ */
static inline void static inline void switch_to_ready_state(struct nandsim *ns, u_char status)
switch_to_ready_state(struct nandsim *ns, u_char status)
{ {
NS_DBG("switch_to_ready_state: switch to %s state\n", get_state_name(STATE_READY)); NS_DBG("switch_to_ready_state: switch to %s state\n", get_state_name(STATE_READY));
...@@ -719,8 +710,7 @@ switch_to_ready_state(struct nandsim *ns, u_char status) ...@@ -719,8 +710,7 @@ switch_to_ready_state(struct nandsim *ns, u_char status)
* -1 - several matches. * -1 - several matches.
* 0 - operation is found. * 0 - operation is found.
*/ */
static int static int find_operation(struct nandsim *ns, uint32_t flag)
find_operation(struct nandsim *ns, uint32_t flag)
{ {
int opsfound = 0; int opsfound = 0;
int i, j, idx = 0; int i, j, idx = 0;
...@@ -887,8 +877,7 @@ static int prog_page(struct nandsim *ns, int num) ...@@ -887,8 +877,7 @@ static int prog_page(struct nandsim *ns, int num)
* *
* RETURNS: 0 if success, -1 if error. * RETURNS: 0 if success, -1 if error.
*/ */
static int static int do_state_action(struct nandsim *ns, uint32_t action)
do_state_action(struct nandsim *ns, uint32_t action)
{ {
int num; int num;
int busdiv = ns->busw == 8 ? 1 : 2; int busdiv = ns->busw == 8 ? 1 : 2;
...@@ -1020,8 +1009,7 @@ do_state_action(struct nandsim *ns, uint32_t action) ...@@ -1020,8 +1009,7 @@ do_state_action(struct nandsim *ns, uint32_t action)
/* /*
* Switch simulator's state. * Switch simulator's state.
*/ */
static void static void switch_state(struct nandsim *ns)
switch_state(struct nandsim *ns)
{ {
if (ns->op) { if (ns->op) {
/* /*
...@@ -1162,8 +1150,7 @@ switch_state(struct nandsim *ns) ...@@ -1162,8 +1150,7 @@ switch_state(struct nandsim *ns)
} }
} }
static u_char static u_char ns_nand_read_byte(struct mtd_info *mtd)
ns_nand_read_byte(struct mtd_info *mtd)
{ {
struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv; struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
u_char outb = 0x00; u_char outb = 0x00;
...@@ -1236,8 +1223,7 @@ ns_nand_read_byte(struct mtd_info *mtd) ...@@ -1236,8 +1223,7 @@ ns_nand_read_byte(struct mtd_info *mtd)
return outb; return outb;
} }
static void static void ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
{ {
struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv; struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
...@@ -1400,15 +1386,13 @@ static void ns_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int bitmask) ...@@ -1400,15 +1386,13 @@ static void ns_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int bitmask)
ns_nand_write_byte(mtd, cmd); ns_nand_write_byte(mtd, cmd);
} }
static int static int ns_device_ready(struct mtd_info *mtd)
ns_device_ready(struct mtd_info *mtd)
{ {
NS_DBG("device_ready\n"); NS_DBG("device_ready\n");
return 1; return 1;
} }
static uint16_t static uint16_t ns_nand_read_word(struct mtd_info *mtd)
ns_nand_read_word(struct mtd_info *mtd)
{ {
struct nand_chip *chip = (struct nand_chip *)mtd->priv; struct nand_chip *chip = (struct nand_chip *)mtd->priv;
...@@ -1417,8 +1401,7 @@ ns_nand_read_word(struct mtd_info *mtd) ...@@ -1417,8 +1401,7 @@ ns_nand_read_word(struct mtd_info *mtd)
return chip->read_byte(mtd) | (chip->read_byte(mtd) << 8); return chip->read_byte(mtd) | (chip->read_byte(mtd) << 8);
} }
static void static void ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
{ {
struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv; struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
...@@ -1445,8 +1428,7 @@ ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len) ...@@ -1445,8 +1428,7 @@ ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
} }
} }
static void static void ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
{ {
struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv; struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
...@@ -1499,8 +1481,7 @@ ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) ...@@ -1499,8 +1481,7 @@ ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
return; return;
} }
static int static int ns_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
ns_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
{ {
ns_nand_read_buf(mtd, (u_char *)&ns_verify_buf[0], len); ns_nand_read_buf(mtd, (u_char *)&ns_verify_buf[0], len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment