diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/serial.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index ef91fc0390b4..a55e6aeb648e 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
@@ -550,7 +550,7 @@ static ssize_t sleep_timeout_store(struct device *dev, | |||
550 | unsigned int value; | 550 | unsigned int value; |
551 | 551 | ||
552 | if (sscanf(buf, "%u", &value) != 1) { | 552 | if (sscanf(buf, "%u", &value) != 1) { |
553 | printk(KERN_ERR "sleep_timeout_store: Invalid value\n"); | 553 | dev_err(dev, "sleep_timeout_store: Invalid value\n"); |
554 | return -EINVAL; | 554 | return -EINVAL; |
555 | } | 555 | } |
556 | 556 | ||
@@ -666,8 +666,8 @@ void __init omap_serial_early_init(void) | |||
666 | 666 | ||
667 | /* Don't map zero-based physical address */ | 667 | /* Don't map zero-based physical address */ |
668 | if (p->mapbase == 0) { | 668 | if (p->mapbase == 0) { |
669 | printk(KERN_WARNING "omap serial: No physical address" | 669 | dev_warn(dev, "no physical address for uart#%d," |
670 | " for uart#%d, so skipping early_init...\n", i); | 670 | " so skipping early_init...\n", i); |
671 | continue; | 671 | continue; |
672 | } | 672 | } |
673 | /* | 673 | /* |
@@ -676,21 +676,21 @@ void __init omap_serial_early_init(void) | |||
676 | */ | 676 | */ |
677 | p->membase = ioremap(p->mapbase, SZ_8K); | 677 | p->membase = ioremap(p->mapbase, SZ_8K); |
678 | if (!p->membase) { | 678 | if (!p->membase) { |
679 | printk(KERN_ERR "ioremap failed for uart%i\n", i + 1); | 679 | dev_err(dev, "ioremap failed for uart%i\n", i + 1); |
680 | continue; | 680 | continue; |
681 | } | 681 | } |
682 | 682 | ||
683 | sprintf(name, "uart%d_ick", i + 1); | 683 | sprintf(name, "uart%d_ick", i + 1); |
684 | uart->ick = clk_get(NULL, name); | 684 | uart->ick = clk_get(NULL, name); |
685 | if (IS_ERR(uart->ick)) { | 685 | if (IS_ERR(uart->ick)) { |
686 | printk(KERN_ERR "Could not get uart%d_ick\n", i + 1); | 686 | dev_err(dev, "Could not get uart%d_ick\n", i + 1); |
687 | uart->ick = NULL; | 687 | uart->ick = NULL; |
688 | } | 688 | } |
689 | 689 | ||
690 | sprintf(name, "uart%d_fck", i+1); | 690 | sprintf(name, "uart%d_fck", i+1); |
691 | uart->fck = clk_get(NULL, name); | 691 | uart->fck = clk_get(NULL, name); |
692 | if (IS_ERR(uart->fck)) { | 692 | if (IS_ERR(uart->fck)) { |
693 | printk(KERN_ERR "Could not get uart%d_fck\n", i + 1); | 693 | dev_err(dev, "Could not get uart%d_fck\n", i + 1); |
694 | uart->fck = NULL; | 694 | uart->fck = NULL; |
695 | } | 695 | } |
696 | 696 | ||