hw/onenand: Remove unnecessary argument from onenand_command()

Refactor onenand_command() -- since it is essentially a method of
the device object, it doesn't make sense to pass in something as
an argument which is one of the object's own member fields.

Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com>
[Riku Voipio: Fixes and restructuring patchset]
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
[Peter Maydell: More fixes and cleanups for upstream submission]
Signed-off-by:  Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Juha Riihimäki 2011-08-28 16:33:02 +00:00 committed by Peter Maydell
parent 46c305ef6b
commit 82866965e9
1 changed files with 4 additions and 4 deletions

View File

@ -326,7 +326,7 @@ fail:
return 1; return 1;
} }
static void onenand_command(OneNANDState *s, int cmd) static void onenand_command(OneNANDState *s)
{ {
int b; int b;
int sec; int sec;
@ -346,7 +346,7 @@ static void onenand_command(OneNANDState *s, int cmd)
s->data[(s->bufaddr >> 2) & 1][1] : s->boot[1]; \ s->data[(s->bufaddr >> 2) & 1][1] : s->boot[1]; \
buf += (s->bufaddr & 3) << 4; buf += (s->bufaddr & 3) << 4;
switch (cmd) { switch (s->command) {
case 0x00: /* Load single/multiple sector data unit into buffer */ case 0x00: /* Load single/multiple sector data unit into buffer */
SETADDR(ONEN_BUF_BLOCK, ONEN_BUF_PAGE) SETADDR(ONEN_BUF_BLOCK, ONEN_BUF_PAGE)
@ -527,7 +527,7 @@ static void onenand_command(OneNANDState *s, int cmd)
s->status |= ONEN_ERR_CMD; s->status |= ONEN_ERR_CMD;
s->intstatus |= ONEN_INT; s->intstatus |= ONEN_INT;
fprintf(stderr, "%s: unknown OneNAND command %x\n", fprintf(stderr, "%s: unknown OneNAND command %x\n",
__FUNCTION__, cmd); __func__, s->command);
} }
onenand_intr_update(s); onenand_intr_update(s);
@ -659,7 +659,7 @@ static void onenand_write(void *opaque, target_phys_addr_t addr,
if (s->intstatus & (1 << 15)) if (s->intstatus & (1 << 15))
break; break;
s->command = value; s->command = value;
onenand_command(s, s->command); onenand_command(s);
break; break;
case 0xf221: /* System Configuration 1 */ case 0xf221: /* System Configuration 1 */
s->config[0] = value; s->config[0] = value;