4 files changed, 46 insertions, 71 deletions

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index b0ace5bc950c..91691a6c004e 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -86,33 +86,18 @@ config PMAC_SMU
           on the "SMU" system control chip which replaces the old PMU.
           If you don't know, say Y.
 
-config PMAC_PBOOK
-        bool "Power management support for PowerBooks"
-        depends on ADB_PMU
-        ---help---
-          This provides support for putting a PowerBook to sleep; it also
-          enables media bay support.  Power management works on the
-          PB2400/3400/3500, Wallstreet, Lombard, and Bronze PowerBook G3 and
-          the Titanium Powerbook G4, as well as the iBooks.  You should get
-          the power management daemon, pmud, to make it work and you must have
-          the /dev/pmu device (see the pmud README).
-
-          Get pmud from <ftp://ftp.samba.org/pub/ppclinux/pmud/>.
-
-          If you have a PowerBook, you should say Y here.
-
-          You may also want to compile the dma sound driver as a module and
-          have it autoloaded. The act of removing the module shuts down the
-          sound hardware for more power savings.
-
-config PM
-        bool
-        depends on PPC_PMAC && ADB_PMU && PMAC_PBOOK
-        default y
-
 config PMAC_APM_EMU
         tristate "APM emulation"
-        depends on PMAC_PBOOK
+        depends on PPC_PMAC && PPC32 && PM
+
+config PMAC_MEDIABAY
+        bool "Support PowerBook hotswap media bay"
+        depends on PPC_PMAC && PPC32
+        help
+          This option adds support for older PowerBook's hotswap media bay
+          that can contains batteries, floppy drives, or IDE devices. PCI
+          devices are not fully supported in the bay as I never had one to
+          try with
 
 # made a separate option since backlight may end up beeing used
 # on non-powerbook machines (but only on PMU based ones AFAIK)
diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile
index b3f88a4fcef7..f5ae171dbfef 100644
--- a/drivers/macintosh/Makefile
+++ b/drivers/macintosh/Makefile
@@ -6,7 +6,7 @@
 
 obj-$(CONFIG_PPC_PMAC)          += macio_asic.o
 
-obj-$(CONFIG_PMAC_PBOOK)        += mediabay.o
+obj-$(CONFIG_PMAC_MEDIABAY)     += mediabay.o
 obj-$(CONFIG_MAC_EMUMOUSEBTN)   += mac_hid.o
 obj-$(CONFIG_INPUT_ADBHID)      += adbhid.o
 obj-$(CONFIG_ANSLCD)            += ans-lcd.o
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 493e2afa191c..c0dc1e3fa58b 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -90,7 +90,7 @@ static int sleepy_trackpad;
 static int autopoll_devs;
 int __adb_probe_sync;
 
-#ifdef CONFIG_PMAC_PBOOK
+#ifdef CONFIG_PM
 static int adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
 static struct pmu_sleep_notifier adb_sleep_notifier = {
         adb_notify_sleep,
@@ -320,9 +320,9 @@ int __init adb_init(void)
                 printk(KERN_WARNING "Warning: no ADB interface detected\n");
                 adb_controller = NULL;
         } else {
-#ifdef CONFIG_PMAC_PBOOK
+#ifdef CONFIG_PM
                 pmu_register_sleep_notifier(&adb_sleep_notifier);
-#endif /* CONFIG_PMAC_PBOOK */
+#endif /* CONFIG_PM */
 #ifdef CONFIG_PPC
                 if (machine_is_compatible("AAPL,PowerBook1998") ||
                         machine_is_compatible("PowerBook1,1"))
@@ -337,7 +337,7 @@ int __init adb_init(void)
 
 __initcall(adb_init);
 
-#ifdef CONFIG_PMAC_PBOOK
+#ifdef CONFIG_PM
 /*
  * notify clients before sleep and reset bus afterwards
  */
@@ -378,7 +378,7 @@ adb_notify_sleep(struct pmu_sleep_notifier *self, int when)
         }
         return PBOOK_SLEEP_OK;
 }
-#endif /* CONFIG_PMAC_PBOOK */
+#endif /* CONFIG_PM */
 
 static int
 do_adb_reset_bus(void)
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 5375df03c6f3..4a0a0ad2d03c 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -155,10 +155,10 @@ static spinlock_t pmu_lock;
 static u8 pmu_intr_mask;
 static int pmu_version;
 static int drop_interrupts;
-#ifdef CONFIG_PMAC_PBOOK
+#ifdef CONFIG_PM
 static int option_lid_wakeup = 1;
 static int sleep_in_progress;
-#endif /* CONFIG_PMAC_PBOOK */
+#endif /* CONFIG_PM */
 static unsigned long async_req_locks;
 static unsigned int pmu_irq_stats[11];
 
@@ -168,7 +168,6 @@ static struct proc_dir_entry *proc_pmu_irqstats;
 static struct proc_dir_entry *proc_pmu_options;
 static int option_server_mode;
 
-#ifdef CONFIG_PMAC_PBOOK
 int pmu_battery_count;
 int pmu_cur_battery;
 unsigned int pmu_power_flags;
@@ -176,7 +175,6 @@ struct pmu_battery_info pmu_batteries[PMU_MAX_BATTERIES];
 static int query_batt_timer = BATTERY_POLLING_COUNT;
 static struct adb_request batt_req;
 static struct proc_dir_entry *proc_pmu_batt[PMU_MAX_BATTERIES];
-#endif /* CONFIG_PMAC_PBOOK */
 
 #if defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_PMAC_BACKLIGHT)
 extern int disable_kernel_backlight;
@@ -210,11 +208,9 @@ static int proc_get_irqstats(char *page, char **start, off_t off,
 static int pmu_set_backlight_level(int level, void* data);
 static int pmu_set_backlight_enable(int on, int level, void* data);
 #endif /* CONFIG_PMAC_BACKLIGHT */
-#ifdef CONFIG_PMAC_PBOOK
 static void pmu_pass_intr(unsigned char *data, int len);
 static int proc_get_batt(char *page, char **start, off_t off,
                         int count, int *eof, void *data);
-#endif /* CONFIG_PMAC_PBOOK */
 static int proc_read_options(char *page, char **start, off_t off,
                         int count, int *eof, void *data);
 static int proc_write_options(struct file *file, const char __user *buffer,
@@ -407,9 +403,7 @@ static int __init via_pmu_start(void)
 
         bright_req_1.complete = 1;
         bright_req_2.complete = 1;
-#ifdef CONFIG_PMAC_PBOOK
         batt_req.complete = 1;
-#endif
 
 #ifdef CONFIG_PPC32
         if (pmu_kind == PMU_KEYLARGO_BASED)
@@ -468,7 +462,7 @@ static int __init via_pmu_dev_init(void)
         register_backlight_controller(&pmu_backlight_controller, NULL, "pmu");
 #endif /* CONFIG_PMAC_BACKLIGHT */
 
-#ifdef CONFIG_PMAC_PBOOK
+#ifdef CONFIG_PPC32
         if (machine_is_compatible("AAPL,3400/2400") ||
                 machine_is_compatible("AAPL,3500")) {
                 int mb = pmac_call_feature(PMAC_FTR_GET_MB_INFO,
@@ -496,20 +490,19 @@ static int __init via_pmu_dev_init(void)
                                 pmu_batteries[1].flags |= PMU_BATT_TYPE_SMART;
                 }
         }
-#endif /* CONFIG_PMAC_PBOOK */
+#endif /* CONFIG_PPC32 */
+
         /* Create /proc/pmu */
         proc_pmu_root = proc_mkdir("pmu", NULL);
         if (proc_pmu_root) {
-#ifdef CONFIG_PMAC_PBOOK
-                int i;
+                long i;
 
                 for (i=0; i<pmu_battery_count; i++) {
                         char title[16];
-                        sprintf(title, "battery_%d", i);
+                        sprintf(title, "battery_%ld", i);
                         proc_pmu_batt[i] = create_proc_read_entry(title, 0, proc_pmu_root,
                                                 proc_get_batt, (void *)i);
                 }
-#endif /* CONFIG_PMAC_PBOOK */
 
                 proc_pmu_info = create_proc_read_entry("info", 0, proc_pmu_root,
                                         proc_get_info, NULL);
@@ -629,8 +622,6 @@ static void pmu_set_server_mode(int server_mode)
         pmu_wait_complete(&req);
 }
 
-#ifdef CONFIG_PMAC_PBOOK
-
 /* This new version of the code for 2400/3400/3500 powerbooks
  * is inspired from the implementation in gkrellm-pmu
  */
@@ -813,8 +804,6 @@ query_battery_state(void)
                         2, PMU_SMART_BATTERY_STATE, pmu_cur_battery+1);
 }
 
-#endif /* CONFIG_PMAC_PBOOK */
-
 static int __pmac
 proc_get_info(char *page, char **start, off_t off,
                 int count, int *eof, void *data)
@@ -823,11 +812,9 @@ proc_get_info(char *page, char **start, off_t off,
 
         p += sprintf(p, "PMU driver version     : %d\n", PMU_DRIVER_VERSION);
         p += sprintf(p, "PMU firmware version   : %02x\n", pmu_version);
-#ifdef CONFIG_PMAC_PBOOK
         p += sprintf(p, "AC Power               : %d\n",
                 ((pmu_power_flags & PMU_PWR_AC_PRESENT) != 0));
         p += sprintf(p, "Battery count          : %d\n", pmu_battery_count);
-#endif /* CONFIG_PMAC_PBOOK */
 
         return p - page;
 }
@@ -859,12 +846,11 @@ proc_get_irqstats(char *page, char **start, off_t off,
         return p - page;
 }
 
-#ifdef CONFIG_PMAC_PBOOK
 static int __pmac
 proc_get_batt(char *page, char **start, off_t off,
                 int count, int *eof, void *data)
 {
-        int batnum = (int)data;
+        long batnum = (long)data;
         char *p = page;
         
         p += sprintf(p, "\n");
@@ -883,7 +869,6 @@ proc_get_batt(char *page, char **start, off_t off,
 
         return p - page;
 }
-#endif /* CONFIG_PMAC_PBOOK */
 
 static int __pmac
 proc_read_options(char *page, char **start, off_t off,
@@ -891,11 +876,11 @@ proc_read_options(char *page, char **start, off_t off,
 {
         char *p = page;
 
-#ifdef CONFIG_PMAC_PBOOK
+#ifdef CONFIG_PM
         if (pmu_kind == PMU_KEYLARGO_BASED &&
             pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
                 p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);
-#endif /* CONFIG_PMAC_PBOOK */
+#endif
         if (pmu_kind == PMU_KEYLARGO_BASED)
                 p += sprintf(p, "server_mode=%d\n", option_server_mode);
 
@@ -932,12 +917,12 @@ proc_write_options(struct file *file, const char __user *buffer,
         *(val++) = 0;
         while(*val == ' ')
                 val++;
-#ifdef CONFIG_PMAC_PBOOK
+#ifdef CONFIG_PM
         if (pmu_kind == PMU_KEYLARGO_BASED &&
             pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
                 if (!strcmp(label, "lid_wakeup"))
                         option_lid_wakeup = ((*val) == '1');
-#endif /* CONFIG_PMAC_PBOOK */
+#endif
         if (pmu_kind == PMU_KEYLARGO_BASED && !strcmp(label, "server_mode")) {
                 int new_value;
                 new_value = ((*val) == '1');
@@ -1432,7 +1417,6 @@ next:
         }
         /* Tick interrupt */
         else if ((1 << pirq) & PMU_INT_TICK) {
-#ifdef CONFIG_PMAC_PBOOK
                 /* Environement or tick interrupt, query batteries */
                 if (pmu_battery_count) {
                         if ((--query_batt_timer) == 0) {
@@ -1447,7 +1431,6 @@ next:
                 pmu_pass_intr(data, len);
         } else {
                pmu_pass_intr(data, len);
-#endif /* CONFIG_PMAC_PBOOK */
         }
         goto next;
 }
@@ -2062,7 +2045,7 @@ pmu_i2c_simple_write(int bus, int addr,  u8* data, int len)
         return -1;
 }
 
-#ifdef CONFIG_PMAC_PBOOK
+#ifdef CONFIG_PM
 
 static LIST_HEAD(sleep_notifiers);
 
@@ -2715,6 +2698,8 @@ powerbook_sleep_3400(void)
         return 0;
 }
 
+#endif /* CONFIG_PM */
+
 /*
  * Support for /dev/pmu device
  */
@@ -2894,11 +2879,11 @@ static int __pmac
 pmu_ioctl(struct inode * inode, struct file *filp,
                      u_int cmd, u_long arg)
 {
-        struct pmu_private *pp = filp->private_data;
         __u32 __user *argp = (__u32 __user *)arg;
-        int error;
+        int error = -EINVAL;
 
         switch (cmd) {
+#ifdef CONFIG_PM
         case PMU_IOC_SLEEP:
                 if (!capable(CAP_SYS_ADMIN))
                         return -EACCES;
@@ -2920,12 +2905,13 @@ pmu_ioctl(struct inode * inode, struct file *filp,
                         error = -ENOSYS;
                 }
                 sleep_in_progress = 0;
-                return error;
+                break;
         case PMU_IOC_CAN_SLEEP:
                 if (pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) < 0)
                         return put_user(0, argp);
                 else
                         return put_user(1, argp);
+#endif /* CONFIG_PM */
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         /* Backlight should have its own device or go via
@@ -2946,11 +2932,13 @@ pmu_ioctl(struct inode * inode, struct file *filp,
                 error = get_user(value, argp);
                 if (!error)
                         error = set_backlight_level(value);
-                return error;
+                break;
         }
 #ifdef CONFIG_INPUT_ADBHID
         case PMU_IOC_GRAB_BACKLIGHT: {
+                struct pmu_private *pp = filp->private_data;
                 unsigned long flags;
+
                 if (pp->backlight_locker)
                         return 0;
                 pp->backlight_locker = 1;
@@ -2966,7 +2954,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
         case PMU_IOC_HAS_ADB:
                 return put_user(pmu_has_adb, argp);
         }
-        return -EINVAL;
+        return error;
 }
 
 static struct file_operations pmu_device_fops __pmacdata = {
@@ -2982,14 +2970,16 @@ static struct miscdevice pmu_device __pmacdata = {
         PMU_MINOR, "pmu", &pmu_device_fops
 };
 
-void pmu_device_init(void)
+static int pmu_device_init(void)
 {
         if (!via)
-                return;
+                return 0;
         if (misc_register(&pmu_device) < 0)
                 printk(KERN_ERR "via-pmu: cannot register misc device.\n");
+        return 0;
 }
-#endif /* CONFIG_PMAC_PBOOK */
+device_initcall(pmu_device_init);
+
 
 #ifdef DEBUG_SLEEP
 static inline void  __pmac
@@ -3157,12 +3147,12 @@ EXPORT_SYMBOL(pmu_i2c_combined_read);
 EXPORT_SYMBOL(pmu_i2c_stdsub_write);
 EXPORT_SYMBOL(pmu_i2c_simple_read);
 EXPORT_SYMBOL(pmu_i2c_simple_write);
-#ifdef CONFIG_PMAC_PBOOK
+#ifdef CONFIG_PM
 EXPORT_SYMBOL(pmu_register_sleep_notifier);
 EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
 EXPORT_SYMBOL(pmu_enable_irled);
 EXPORT_SYMBOL(pmu_battery_count);
 EXPORT_SYMBOL(pmu_batteries);
 EXPORT_SYMBOL(pmu_power_flags);
-#endif /* CONFIG_PMAC_PBOOK */
+#endif /* CONFIG_PM */