3 files changed, 16 insertions, 11 deletions

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 58926da0ae18..f44c94abd883 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -113,7 +113,6 @@ config PMAC_SMU
 
 config PMAC_APM_EMU
         tristate "APM emulation"
-        select SYS_SUPPORTS_APM_EMULATION
         select APM_EMULATION
         depends on ADB_PMU && PM
 
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index b77ef5187d6d..b46817f699f1 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -628,16 +628,16 @@ static void real_leds(unsigned char leds, int device)
  */
 static int adbhid_kbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-        struct adbhid *adbhid = dev->private;
+        struct adbhid *adbhid = input_get_drvdata(dev);
         unsigned char leds;
 
         switch (type) {
         case EV_LED:
-          leds = (test_bit(LED_SCROLLL, dev->led) ? 4 : 0)
-               | (test_bit(LED_NUML,    dev->led) ? 1 : 0)
-               | (test_bit(LED_CAPSL,   dev->led) ? 2 : 0);
-          real_leds(leds, adbhid->id);
-          return 0;
+                leds =  (test_bit(LED_SCROLLL, dev->led) ? 4 : 0) |
+                        (test_bit(LED_NUML,    dev->led) ? 1 : 0) |
+                        (test_bit(LED_CAPSL,   dev->led) ? 2 : 0);
+                real_leds(leds, adbhid->id);
+                return 0;
         }
 
         return -1;
@@ -649,7 +649,7 @@ adb_message_handler(struct notifier_block *this, unsigned long code, void *x)
         switch (code) {
         case ADB_MSG_PRE_RESET:
         case ADB_MSG_POWERDOWN:
-                /* Stop the repeat timer. Autopoll is already off at this point */
+                /* Stop the repeat timer. Autopoll is already off at this point */
                 {
                         int i;
                         for (i = 1; i < 16; i++) {
@@ -699,7 +699,7 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
         hid->current_handler_id = current_handler_id;
         hid->mouse_kind = mouse_kind;
         hid->flags = 0;
-        input_dev->private = hid;
+        input_set_drvdata(input_dev, hid);
         input_dev->name = hid->name;
         input_dev->phys = hid->phys;
         input_dev->id.bustype = BUS_ADB;
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index 192b26e97777..11ced17f438a 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -216,7 +216,10 @@ int wf_register_control(struct wf_control *new_ct)
         new_ct->attr.attr.mode = 0644;
         new_ct->attr.show = wf_show_control;
         new_ct->attr.store = wf_store_control;
-        device_create_file(&wf_platform_device.dev, &new_ct->attr);
+        if (device_create_file(&wf_platform_device.dev, &new_ct->attr))
+                printk(KERN_WARNING "windfarm: device_create_file failed"
+                        " for %s\n", new_ct->name);
+                /* the subsystem still does useful work without the file */
 
         DBG("wf: Registered control %s\n", new_ct->name);
 
@@ -326,7 +329,10 @@ int wf_register_sensor(struct wf_sensor *new_sr)
         new_sr->attr.attr.mode = 0444;
         new_sr->attr.show = wf_show_sensor;
         new_sr->attr.store = NULL;
-        device_create_file(&wf_platform_device.dev, &new_sr->attr);
+        if (device_create_file(&wf_platform_device.dev, &new_sr->attr))
+                printk(KERN_WARNING "windfarm: device_create_file failed"
+                        " for %s\n", new_sr->name);
+                /* the subsystem still does useful work without the file */
 
         DBG("wf: Registered sensor %s\n", new_sr->name);