4 files changed, 26 insertions, 29 deletions

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 7ce0ea64465c..28958101061f 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -36,6 +36,7 @@
 #include <linux/completion.h>
 #include <linux/device.h>
 #include <linux/kthread.h>
+#include <linux/platform_device.h>
 
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 18dde2a27209..936788272a5f 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -78,12 +78,14 @@ struct media_bay_info {
         int                             cached_gpio;
         int                             sleeping;
         struct semaphore                lock;
-#ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_BLK_DEV_IDE_PMAC
         void __iomem                    *cd_base;
-        int                             cd_index;
         int                             cd_irq;
         int                             cd_retry;
 #endif
+#if defined(CONFIG_BLK_DEV_IDE_PMAC) || defined(CONFIG_MAC_FLOPPY)
+        int                             cd_index;
+#endif
 };
 
 #define MAX_BAYS        2
@@ -91,7 +93,7 @@ struct media_bay_info {
 static struct media_bay_info media_bays[MAX_BAYS];
 int media_bay_count = 0;
 
-#ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_BLK_DEV_IDE_PMAC
 /* check the busy bit in the media-bay ide interface
    (assumes the media-bay contains an ide device) */
 #define MB_IDE_READY(i) ((readb(media_bays[i].cd_base + 0x70) & 0x80) == 0)
@@ -401,7 +403,7 @@ static void poll_media_bay(struct media_bay_info* bay)
                                 set_mb_power(bay, id != MB_NO);
                                 bay->content_id = id;
                                 if (id == MB_NO) {
-#ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_BLK_DEV_IDE_PMAC
                                         bay->cd_retry = 0;
 #endif
                                         printk(KERN_INFO "media bay %d is empty\n", bay->index);
@@ -414,9 +416,9 @@ static void poll_media_bay(struct media_bay_info* bay)
         }
 }
 
+#ifdef CONFIG_MAC_FLOPPY
 int check_media_bay(struct device_node *which_bay, int what)
 {
-#ifdef CONFIG_BLK_DEV_IDE
         int     i;
 
         for (i=0; i<media_bay_count; i++)
@@ -426,14 +428,14 @@ int check_media_bay(struct device_node *which_bay, int what)
                         media_bays[i].cd_index = -1;
                         return -EINVAL;
                 }
-#endif /* CONFIG_BLK_DEV_IDE */
         return -ENODEV;
 }
 EXPORT_SYMBOL(check_media_bay);
+#endif /* CONFIG_MAC_FLOPPY */
 
+#ifdef CONFIG_BLK_DEV_IDE_PMAC
 int check_media_bay_by_base(unsigned long base, int what)
 {
-#ifdef CONFIG_BLK_DEV_IDE
         int     i;
 
         for (i=0; i<media_bay_count; i++)
@@ -443,15 +445,13 @@ int check_media_bay_by_base(unsigned long base, int what)
                         media_bays[i].cd_index = -1;
                         return -EINVAL;
                 } 
-#endif
-        
+
         return -ENODEV;
 }
 
 int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base,
-        int irq, int index)
+                            int irq, int index)
 {
-#ifdef CONFIG_BLK_DEV_IDE
         int     i;
 
         for (i=0; i<media_bay_count; i++) {
@@ -483,10 +483,10 @@ int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base,
                         return -ENODEV;
                 }
         }
-#endif /* CONFIG_BLK_DEV_IDE */
-        
+
         return -ENODEV;
 }
+#endif /* CONFIG_BLK_DEV_IDE_PMAC */
 
 static void media_bay_step(int i)
 {
@@ -521,14 +521,13 @@ static void media_bay_step(int i)
                 bay->state = mb_resetting;
                 MBDBG("mediabay%d: waiting reset (kind:%d)\n", i, bay->content_id);
                 break;
-            
         case mb_resetting:
                 if (bay->content_id != MB_CD) {
                         MBDBG("mediabay%d: bay is up (kind:%d)\n", i, bay->content_id);
                         bay->state = mb_up;
                         break;
                 }
-#ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_BLK_DEV_IDE_PMAC
                 MBDBG("mediabay%d: waiting IDE reset (kind:%d)\n", i, bay->content_id);
                 bay->ops->un_reset_ide(bay);
                 bay->timer = msecs_to_jiffies(MB_IDE_WAIT);
@@ -536,16 +535,14 @@ static void media_bay_step(int i)
 #else
                 printk(KERN_DEBUG "media-bay %d is ide (not compiled in kernel)\n", i);
                 set_mb_power(bay, 0);
-#endif /* CONFIG_BLK_DEV_IDE */
+#endif /* CONFIG_BLK_DEV_IDE_PMAC */
                 break;
-            
-#ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_BLK_DEV_IDE_PMAC
         case mb_ide_resetting:
                 bay->timer = msecs_to_jiffies(MB_IDE_TIMEOUT);
                 bay->state = mb_ide_waiting;
                 MBDBG("mediabay%d: waiting IDE ready (kind:%d)\n", i, bay->content_id);
                 break;
-            
         case mb_ide_waiting:
                 if (bay->cd_base == NULL) {
                         bay->timer = 0;
@@ -587,15 +584,14 @@ static void media_bay_step(int i)
                         bay->timer = 0;
                 }
                 break;
-#endif /* CONFIG_BLK_DEV_IDE */
-
+#endif /* CONFIG_BLK_DEV_IDE_PMAC */
         case mb_powering_down:
                 bay->state = mb_empty;
-#ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_BLK_DEV_IDE_PMAC
                 if (bay->cd_index >= 0) {
                         printk(KERN_DEBUG "Unregistering mb %d ide, index:%d\n", i,
                                bay->cd_index);
-                        ide_unregister(bay->cd_index);
+                        ide_unregister(bay->cd_index, 1, 1);
                         bay->cd_index = -1;
                 }
                 if (bay->cd_retry) {
@@ -607,7 +603,7 @@ static void media_bay_step(int i)
                                 bay->content_id = MB_NO;
                         }
                 }
-#endif /* CONFIG_BLK_DEV_IDE */    
+#endif /* CONFIG_BLK_DEV_IDE_PMAC */
                 MBDBG("mediabay%d: end of power down\n", i);
                 break;
         }
@@ -739,7 +735,7 @@ static int media_bay_resume(struct macio_dev *mdev)
                 bay->last_value = bay->content_id;
                 bay->value_count = msecs_to_jiffies(MB_STABLE_DELAY);
                 bay->timer = msecs_to_jiffies(MB_POWER_DELAY);
-#ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_BLK_DEV_IDE_PMAC
                 bay->cd_retry = 0;
 #endif
                 do {
@@ -829,7 +825,7 @@ static int __init media_bay_init(void)
         for (i=0; i<MAX_BAYS; i++) {
                 memset((char *)&media_bays[i], 0, sizeof(struct media_bay_info));
                 media_bays[i].content_id        = -1;
-#ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_BLK_DEV_IDE_PMAC
                 media_bays[i].cd_index          = -1;
 #endif
         }
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index d409f6759482..8ba49385c3ff 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -12,7 +12,7 @@
  *  - maybe add timeout to commands ?
  *  - blocking version of time functions
  *  - polling version of i2c commands (including timer that works with
- *    interrutps off)
+ *    interrupts off)
  *  - maybe avoid some data copies with i2c by directly using the smu cmd
  *    buffer and a lower level internal interface
  *  - understand SMU -> CPU events and implement reception of them via
@@ -179,7 +179,7 @@ static irqreturn_t smu_db_intr(int irq, void *arg)
                 /* CPU might have brought back the cache line, so we need
                  * to flush again before peeking at the SMU response. We
                  * flush the entire buffer for now as we haven't read the
-                 * reply lenght (it's only 2 cache lines anyway)
+                 * reply length (it's only 2 cache lines anyway)
                  */
                 faddr = (unsigned long)smu->cmd_buf;
                 flush_inval_dcache_range(faddr, faddr + 256);
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index 01b8eca7ccd5..6e6dd17ab572 100644
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -111,7 +111,7 @@ static enum macii_state {
 static struct adb_request *current_req; /* first request struct in the queue */
 static struct adb_request *last_req;     /* last request struct in the queue */
 static unsigned char reply_buf[16];        /* storage for autopolled replies */
-static unsigned char *reply_ptr;      /* next byte in req->data or reply_buf */
+static unsigned char *reply_ptr;     /* next byte in reply_buf or req->reply */
 static int reading_reply;        /* store reply in reply_buf else req->reply */
 static int data_index;      /* index of the next byte to send from req->data */
 static int reply_len; /* number of bytes received in reply_buf or req->reply */