diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-23 00:55:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-23 00:55:13 +0200 |
| commit | 4eb5178c9cc09295111b79a99183f555c51887b4 (patch) | |
| tree | 71b8b2446558c5175e82240c07a6fbe4916a1b93 /drivers/cpufreq/sparc-us2e-cpufreq.c | |
| parent | b36f4be3de1b123d8601de062e7dbfc904f305fb (diff) | |
| parent | 5025d628c8659fbf939f929107bf76db81dcdfff (diff) | |
Merge back earlier 'pm-cpufreq' material.
Diffstat (limited to 'drivers/cpufreq/sparc-us2e-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/sparc-us2e-cpufreq.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/cpufreq/sparc-us2e-cpufreq.c b/drivers/cpufreq/sparc-us2e-cpufreq.c index 93061a40877..cf5bc2ca16f 100644 --- a/drivers/cpufreq/sparc-us2e-cpufreq.c +++ b/drivers/cpufreq/sparc-us2e-cpufreq.c @@ -351,12 +351,11 @@ static int __init us2e_freq_init(void) struct cpufreq_driver *driver; ret = -ENOMEM; - driver = kzalloc(sizeof(struct cpufreq_driver), GFP_KERNEL); + driver = kzalloc(sizeof(*driver), GFP_KERNEL); if (!driver) goto err_out; - us2e_freq_table = kzalloc( - (NR_CPUS * sizeof(struct us2e_freq_percpu_info)), + us2e_freq_table = kzalloc((NR_CPUS * sizeof(*us2e_freq_table)), GFP_KERNEL); if (!us2e_freq_table) goto err_out; @@ -366,7 +365,6 @@ static int __init us2e_freq_init(void) driver->target = us2e_freq_target; driver->get = us2e_freq_get; driver->exit = us2e_freq_cpu_exit; - driver->owner = THIS_MODULE, strcpy(driver->name, "UltraSPARC-IIe"); cpufreq_us2e_driver = driver; |