fbmem: avoid printk format warning with 32-bit resources

[safe/jmp/linux-2.6] / drivers / macintosh / windfarm_pm81.c

diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index abbe206..749d174 100644 (file)
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -188,7 +188,7 @@ struct wf_smu_sys_fans_state {
 };
 
 /*
- * Configs for SMU Sytem Fan control loop
+ * Configs for SMU System Fan control loop
  */
 static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = {
        /* Model ID 2 */
@@ -757,10 +757,8 @@ static int __devexit wf_smu_remove(struct platform_device *ddev)
                wf_put_control(cpufreq_clamp);
 
        /* Destroy control loops state structures */
-       if (wf_smu_sys_fans)
-               kfree(wf_smu_sys_fans);
-       if (wf_smu_cpu_fans)
-               kfree(wf_smu_cpu_fans);
+       kfree(wf_smu_sys_fans);
+       kfree(wf_smu_cpu_fans);
 
        return 0;
 }
@@ -779,8 +777,8 @@ static int __init wf_smu_init(void)
 {
        int rc = -ENODEV;
 
-       if (machine_is_compatible("PowerMac8,1") ||
-           machine_is_compatible("PowerMac8,2"))
+       if (of_machine_is_compatible("PowerMac8,1") ||
+           of_machine_is_compatible("PowerMac8,2"))
                rc = wf_init_pm();
 
        if (rc == 0) {