| .. | .. |
|---|
| 527 | 527 | case XenbusStateClosed: |
|---|
| 528 | 528 | if (dev->state == XenbusStateClosed) |
|---|
| 529 | 529 | break; |
|---|
| 530 | | - /* Missed the backend's CLOSING state -- fallthrough */ |
|---|
| 530 | + fallthrough; /* Missed the backend's CLOSING state */ |
|---|
| 531 | 531 | case XenbusStateClosing: |
|---|
| 532 | 532 | xenbus_frontend_closed(dev); |
|---|
| 533 | 533 | break; |
|---|
| .. | .. |
|---|
| 638 | 638 | #endif |
|---|
| 639 | 639 | |
|---|
| 640 | 640 | #ifdef CONFIG_EARLY_PRINTK |
|---|
| 641 | | -static int __init xenboot_setup_console(struct console *console, char *string) |
|---|
| 641 | +static int __init xenboot_console_setup(struct console *console, char *string) |
|---|
| 642 | 642 | { |
|---|
| 643 | 643 | static struct xencons_info xenboot; |
|---|
| 644 | 644 | |
|---|
| .. | .. |
|---|
| 682 | 682 | struct console xenboot_console = { |
|---|
| 683 | 683 | .name = "xenboot", |
|---|
| 684 | 684 | .write = xenboot_write_console, |
|---|
| 685 | | - .setup = xenboot_setup_console, |
|---|
| 685 | + .setup = xenboot_console_setup, |
|---|
| 686 | 686 | .flags = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME, |
|---|
| 687 | 687 | .index = -1, |
|---|
| 688 | 688 | }; |
|---|