|
@@ -549,7 +549,7 @@ static void sh_cmt_clocksource_resume(struct clocksource *cs)
|
|
}
|
|
}
|
|
|
|
|
|
static int sh_cmt_register_clocksource(struct sh_cmt_channel *ch,
|
|
static int sh_cmt_register_clocksource(struct sh_cmt_channel *ch,
|
|
- char *name, unsigned long rating)
|
|
|
|
|
|
+ const char *name, unsigned long rating)
|
|
{
|
|
{
|
|
struct clocksource *cs = &ch->cs;
|
|
struct clocksource *cs = &ch->cs;
|
|
|
|
|
|
@@ -660,7 +660,7 @@ static void sh_cmt_clock_event_resume(struct clock_event_device *ced)
|
|
}
|
|
}
|
|
|
|
|
|
static void sh_cmt_register_clockevent(struct sh_cmt_channel *ch,
|
|
static void sh_cmt_register_clockevent(struct sh_cmt_channel *ch,
|
|
- char *name, unsigned long rating)
|
|
|
|
|
|
+ const char *name, unsigned long rating)
|
|
{
|
|
{
|
|
struct clock_event_device *ced = &ch->ced;
|
|
struct clock_event_device *ced = &ch->ced;
|
|
|
|
|
|
@@ -680,7 +680,7 @@ static void sh_cmt_register_clockevent(struct sh_cmt_channel *ch,
|
|
clockevents_register_device(ced);
|
|
clockevents_register_device(ced);
|
|
}
|
|
}
|
|
|
|
|
|
-static int sh_cmt_register(struct sh_cmt_channel *ch, char *name,
|
|
|
|
|
|
+static int sh_cmt_register(struct sh_cmt_channel *ch, const char *name,
|
|
unsigned long clockevent_rating,
|
|
unsigned long clockevent_rating,
|
|
unsigned long clocksource_rating)
|
|
unsigned long clocksource_rating)
|
|
{
|
|
{
|
|
@@ -717,7 +717,7 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel *ch,
|
|
ch->match_value = ch->max_match_value;
|
|
ch->match_value = ch->max_match_value;
|
|
raw_spin_lock_init(&ch->lock);
|
|
raw_spin_lock_init(&ch->lock);
|
|
|
|
|
|
- ret = sh_cmt_register(ch, (char *)dev_name(&cmt->pdev->dev),
|
|
|
|
|
|
+ ret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev),
|
|
cfg->clockevent_rating,
|
|
cfg->clockevent_rating,
|
|
cfg->clocksource_rating);
|
|
cfg->clocksource_rating);
|
|
if (ret) {
|
|
if (ret) {
|