diff options
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/sh_cmt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index 75b1f83a60a8..c753efcfe9f5 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c | |||
@@ -656,12 +656,12 @@ static void sh_cmt_clocksource_resume(struct clocksource *cs) | |||
656 | } | 656 | } |
657 | 657 | ||
658 | static int sh_cmt_register_clocksource(struct sh_cmt_channel *ch, | 658 | static int sh_cmt_register_clocksource(struct sh_cmt_channel *ch, |
659 | const char *name, unsigned long rating) | 659 | const char *name) |
660 | { | 660 | { |
661 | struct clocksource *cs = &ch->cs; | 661 | struct clocksource *cs = &ch->cs; |
662 | 662 | ||
663 | cs->name = name; | 663 | cs->name = name; |
664 | cs->rating = rating; | 664 | cs->rating = 125; |
665 | cs->read = sh_cmt_clocksource_read; | 665 | cs->read = sh_cmt_clocksource_read; |
666 | cs->enable = sh_cmt_clocksource_enable; | 666 | cs->enable = sh_cmt_clocksource_enable; |
667 | cs->disable = sh_cmt_clocksource_disable; | 667 | cs->disable = sh_cmt_clocksource_disable; |
@@ -788,13 +788,13 @@ static void sh_cmt_register_clockevent(struct sh_cmt_channel *ch, | |||
788 | } | 788 | } |
789 | 789 | ||
790 | static int sh_cmt_register(struct sh_cmt_channel *ch, const char *name, | 790 | static int sh_cmt_register(struct sh_cmt_channel *ch, const char *name, |
791 | bool clockevent, unsigned long clocksource_rating) | 791 | bool clockevent, bool clocksource) |
792 | { | 792 | { |
793 | if (clockevent) | 793 | if (clockevent) |
794 | sh_cmt_register_clockevent(ch, name); | 794 | sh_cmt_register_clockevent(ch, name); |
795 | 795 | ||
796 | if (clocksource_rating) | 796 | if (clocksource) |
797 | sh_cmt_register_clocksource(ch, name, clocksource_rating); | 797 | sh_cmt_register_clocksource(ch, name); |
798 | 798 | ||
799 | return 0; | 799 | return 0; |
800 | } | 800 | } |
@@ -827,7 +827,7 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel *ch, unsigned int index, | |||
827 | 827 | ||
828 | ret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev), | 828 | ret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev), |
829 | cfg->clockevent_rating != 0, | 829 | cfg->clockevent_rating != 0, |
830 | cfg->clocksource_rating); | 830 | cfg->clocksource_rating != 0); |
831 | if (ret) { | 831 | if (ret) { |
832 | dev_err(&cmt->pdev->dev, "ch%u: registration failed\n", | 832 | dev_err(&cmt->pdev->dev, "ch%u: registration failed\n", |
833 | ch->index); | 833 | ch->index); |