@@ -236,8 +236,8 @@ static void uart##n##_loop(int state) \
\
struct serial_device bfin_serial##n##_device = { \
.name = "bfin_uart"#n, \
- .init = uart##n##_init, \
- .uninit = uart##n##_uninit, \
+ .start = uart##n##_init, \
+ .stop = uart##n##_uninit, \
.setbrg = uart##n##_setbrg, \
.getc = uart##n##_getc, \
.tstc = uart##n##_tstc, \
@@ -35,7 +35,7 @@ static struct serial_device *serial_current;
void serial_register(struct serial_device *dev)
{
#ifdef CONFIG_NEEDS_MANUAL_RELOC
- dev->init += gd->reloc_off;
+ dev->start += gd->reloc_off;
dev->setbrg += gd->reloc_off;
dev->getc += gd->reloc_off;
dev->tstc += gd->reloc_off;
@@ -136,8 +136,8 @@ void serial_stdio_init(void)
strcpy(dev.name, s->name);
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
- dev.start = s->init;
- dev.stop = s->uninit;
+ dev.start = s->start;
+ dev.stop = s->stop;
dev.putc = s->putc;
dev.puts = s->puts;
dev.getc = s->getc;
@@ -168,7 +168,7 @@ void serial_reinit_all(void)
struct serial_device *s;
for (s = serial_devices; s; s = s->next)
- s->init();
+ s->start();
}
static struct serial_device *get_current(void)
@@ -188,7 +188,7 @@ static struct serial_device *get_current(void)
int serial_init(void)
{
- return get_current()->init();
+ return get_current()->start();
}
void serial_setbrg(void)
@@ -288,9 +288,9 @@ int uart_post_test(int flags)
/* Disable loop back */
s->loop(0);
- /* XXX: There is no serial_uninit() !? */
- if (s->uninit)
- s->uninit();
+ /* XXX: There is no serial_stop() !? */
+ if (s->stop)
+ s->stop();
}
done:
@@ -7,8 +7,8 @@ struct serial_device {
/* enough bytes to match alignment of following func pointer */
char name[16];
- int (*init)(void);
- int (*uninit)(void);
+ int (*start)(void);
+ int (*stop)(void);
void (*setbrg)(void);
int (*getc)(void);
int (*tstc)(void);
Rename .init() to .start() and .uninit() to .stop() in struct serial_device. This allows aligning struct serial_device with closer to struct stdio_dev. The real goal here is to allow these two structures to converge together and eventually make one to be a superset of the other. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com> --- arch/blackfin/cpu/serial.c | 4 ++-- common/serial.c | 16 ++++++++-------- include/serial.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)