Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

1 files changed, 31 insertions, 0 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index ec5a4cb173b0..afeb02bbb722 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1949,10 +1949,41 @@ static int ide_uevent(struct device *dev, char **envp, int num_envp,
         return 0;
 }
 
+static int generic_ide_probe(struct device *dev)
+{
+        ide_drive_t *drive = to_ide_device(dev);
+        ide_driver_t *drv = to_ide_driver(dev->driver);
+
+        return drv->probe ? drv->probe(drive) : -ENODEV;
+}
+
+static int generic_ide_remove(struct device *dev)
+{
+        ide_drive_t *drive = to_ide_device(dev);
+        ide_driver_t *drv = to_ide_driver(dev->driver);
+
+        if (drv->remove)
+                drv->remove(drive);
+
+        return 0;
+}
+
+static void generic_ide_shutdown(struct device *dev)
+{
+        ide_drive_t *drive = to_ide_device(dev);
+        ide_driver_t *drv = to_ide_driver(dev->driver);
+
+        if (dev->driver && drv->shutdown)
+                drv->shutdown(drive);
+}
+
 struct bus_type ide_bus_type = {
         .name           = "ide",
         .match          = ide_bus_match,
         .uevent         = ide_uevent,
+        .probe          = generic_ide_probe,
+        .remove         = generic_ide_remove,
+        .shutdown       = generic_ide_shutdown,
         .dev_attrs      = ide_dev_attrs,
         .suspend        = generic_ide_suspend,
         .resume         = generic_ide_resume,