1 files changed, 9 insertions, 13 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 59fe358048b..9c8468de1a7 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -130,7 +130,6 @@
 
 #define _IDE_C                  /* Tell ide.h it's really us */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/string.h>
@@ -147,7 +146,6 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/ide.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/completion.h>
 #include <linux/reboot.h>
 #include <linux/cdrom.h>
@@ -592,13 +590,8 @@ void ide_unregister(unsigned int index)
                 goto abort;
         for (unit = 0; unit < MAX_DRIVES; ++unit) {
                 drive = &hwif->drives[unit];
-                if (!drive->present) {
-                        if (drive->devfs_name[0] != '\0') {
-                                devfs_remove(drive->devfs_name);
-                                drive->devfs_name[0] = '\0';
-                        }
+                if (!drive->present)
                         continue;
-                }
                 spin_unlock_irq(&ide_lock);
                 device_unregister(&drive->gendev);
                 wait_for_completion(&drive->gendev_rel_comp);
@@ -1214,7 +1207,7 @@ int system_bus_clock (void)
 
 EXPORT_SYMBOL(system_bus_clock);
 
-static int generic_ide_suspend(struct device *dev, pm_message_t state)
+static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
 {
         ide_drive_t *drive = dev->driver_data;
         struct request rq;
@@ -1228,7 +1221,9 @@ static int generic_ide_suspend(struct device *dev, pm_message_t state)
         rq.special = &args;
         rq.end_io_data = &rqpm;
         rqpm.pm_step = ide_pm_state_start_suspend;
-        rqpm.pm_state = state.event;
+        if (mesg.event == PM_EVENT_PRETHAW)
+                mesg.event = PM_EVENT_FREEZE;
+        rqpm.pm_state = mesg.event;
 
         return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
@@ -1546,7 +1541,7 @@ static int __init ide_setup(char *s)
                 const char *hd_words[] = {
                         "none", "noprobe", "nowerr", "cdrom", "serialize",
                         "autotune", "noautotune", "minus8", "swapdata", "bswap",
-                        "minus11", "remap", "remap63", "scsi", NULL };
+                        "noflush", "remap", "remap63", "scsi", NULL };
                 unit = s[2] - 'a';
                 hw   = unit / MAX_DRIVES;
                 unit = unit % MAX_DRIVES;
@@ -1585,6 +1580,9 @@ static int __init ide_setup(char *s)
                         case -10: /* "bswap" */
                                 drive->bswap = 1;
                                 goto done;
+                        case -11: /* noflush */
+                                drive->noflush = 1;
+                                goto done;
                         case -12: /* "remap" */
                                 drive->remap_0_to_1 = 1;
                                 goto done;
@@ -1996,7 +1994,6 @@ EXPORT_SYMBOL_GPL(ide_bus_type);
 static int __init ide_init(void)
 {
         printk(KERN_INFO "Uniform Multi-Platform E-IDE driver " REVISION "\n");
-        devfs_mk_dir("ide");
         system_bus_speed = ide_system_bus_speed();
 
         bus_register(&ide_bus_type);
@@ -2074,7 +2071,6 @@ void cleanup_module (void)
 #ifdef CONFIG_PROC_FS
         proc_ide_destroy();
 #endif
-        devfs_remove("ide");
 
         bus_unregister(&ide_bus_type);
 }