diff options
Diffstat (limited to 'drivers/clocksource/acpi_pm.c')
| -rw-r--r-- | drivers/clocksource/acpi_pm.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 72a633a6ec98..cfb0f5278415 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c | |||
| @@ -68,10 +68,7 @@ static struct clocksource clocksource_acpi_pm = { | |||
| 68 | .rating = 200, | 68 | .rating = 200, |
| 69 | .read = acpi_pm_read, | 69 | .read = acpi_pm_read, |
| 70 | .mask = (cycle_t)ACPI_PM_MASK, | 70 | .mask = (cycle_t)ACPI_PM_MASK, |
| 71 | .mult = 0, /*to be calculated*/ | ||
| 72 | .shift = 22, | ||
| 73 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 71 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
| 74 | |||
| 75 | }; | 72 | }; |
| 76 | 73 | ||
| 77 | 74 | ||
| @@ -190,9 +187,6 @@ static int __init init_acpi_pm_clocksource(void) | |||
| 190 | if (!pmtmr_ioport) | 187 | if (!pmtmr_ioport) |
| 191 | return -ENODEV; | 188 | return -ENODEV; |
| 192 | 189 | ||
| 193 | clocksource_acpi_pm.mult = clocksource_hz2mult(PMTMR_TICKS_PER_SEC, | ||
| 194 | clocksource_acpi_pm.shift); | ||
| 195 | |||
| 196 | /* "verify" this timing source: */ | 190 | /* "verify" this timing source: */ |
| 197 | for (j = 0; j < ACPI_PM_MONOTONICITY_CHECKS; j++) { | 191 | for (j = 0; j < ACPI_PM_MONOTONICITY_CHECKS; j++) { |
| 198 | udelay(100 * j); | 192 | udelay(100 * j); |
| @@ -220,7 +214,8 @@ static int __init init_acpi_pm_clocksource(void) | |||
| 220 | if (verify_pmtmr_rate() != 0) | 214 | if (verify_pmtmr_rate() != 0) |
| 221 | return -ENODEV; | 215 | return -ENODEV; |
| 222 | 216 | ||
| 223 | return clocksource_register(&clocksource_acpi_pm); | 217 | return clocksource_register_hz(&clocksource_acpi_pm, |
| 218 | PMTMR_TICKS_PER_SEC); | ||
| 224 | } | 219 | } |
| 225 | 220 | ||
| 226 | /* We use fs_initcall because we want the PCI fixups to have run | 221 | /* We use fs_initcall because we want the PCI fixups to have run |
