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

Linus Torvalds
2 parents 3824ba7df9 9c08a938ce
Showing 48 changed files Side-by-side Diff
arch/arm/common/locomo.c
arch/arm/common/sa1111.c
arch/arm/kernel/ecard.c
arch/arm/mach-integrator/lm.c
arch/ia64/sn/kernel/tiocx.c
arch/parisc/kernel/drivers.c
arch/powerpc/kernel/of_device.c
arch/powerpc/kernel/vio.c
arch/ppc/syslib/ocp.c
arch/sh/kernel/cpu/bus.c
drivers/base/dd.c
drivers/base/driver.c
drivers/base/platform.c
drivers/base/power/shutdown.c
drivers/dio/dio-driver.c
drivers/i2c/i2c-core.c
drivers/ide/ide-cd.c
drivers/ide/ide-disk.c
drivers/ide/ide-floppy.c
drivers/ide/ide-tape.c
@@ -1103,14 +1103,14 @@
 struct bus_type locomo_bus_type = {
 	.name		= "locomo-bus",
 	.match		= locomo_match,
+	.probe		= locomo_bus_probe,
+	.remove		= locomo_bus_remove,
 	.suspend	= locomo_bus_suspend,
 	.resume		= locomo_bus_resume,
 };
  
 int locomo_driver_register(struct locomo_driver *driver)
 {
-	driver->drv.probe = locomo_bus_probe;
-	driver->drv.remove = locomo_bus_remove;
 	driver->drv.bus = &locomo_bus_type;
 	return driver_register(&driver->drv);
 }
@@ -1247,14 +1247,14 @@
 struct bus_type sa1111_bus_type = {
 	.name		= "sa1111-rab",
 	.match		= sa1111_match,
+	.probe		= sa1111_bus_probe,
+	.remove		= sa1111_bus_remove,
 	.suspend	= sa1111_bus_suspend,
 	.resume		= sa1111_bus_resume,
 };
  
 int sa1111_driver_register(struct sa1111_driver *driver)
 {
-	driver->drv.probe = sa1111_bus_probe;
-	driver->drv.remove = sa1111_bus_remove;
 	driver->drv.bus = &sa1111_bus_type;
 	return driver_register(&driver->drv);
 }
@@ -1147,9 +1147,11 @@
 	struct ecard_driver *drv = ECARD_DRV(dev->driver);
 	struct ecard_request req;
  
-	if (drv->shutdown)
-		drv->shutdown(ec);
-	ecard_release(ec);
+	if (dev->driver) {
+		if (drv->shutdown)
+			drv->shutdown(ec);
+		ecard_release(ec);
+	}
  
 	/*
 	 * If this card has a loader, call the reset handler.
@@ -1164,9 +1166,6 @@
 int ecard_register_driver(struct ecard_driver *drv)
 {
 	drv->drv.bus = &ecard_bus_type;
-	drv->drv.probe = ecard_drv_probe;
-	drv->drv.remove = ecard_drv_remove;
-	drv->drv.shutdown = ecard_drv_shutdown;
  
 	return driver_register(&drv->drv);
 }
@@ -1195,6 +1194,9 @@
 	.name		= "ecard",
 	.dev_attrs	= ecard_dev_attrs,
 	.match		= ecard_match,
+	.probe		= ecard_drv_probe,
+	.remove		= ecard_drv_remove,
+	.shutdown	= ecard_drv_shutdown,
 };
  
 static int ecard_bus_init(void)
@@ -22,20 +22,6 @@
 	return 1;
 }
  
-static struct bus_type lm_bustype = {
-	.name		= "logicmodule",
-	.match		= lm_match,
-//	.suspend	= lm_suspend,
-//	.resume		= lm_resume,
-};
-
-static int __init lm_init(void)
-{
-	return bus_register(&lm_bustype);
-}
-
-postcore_initcall(lm_init);
-
 static int lm_bus_probe(struct device *dev)
 {
 	struct lm_device *lmdev = to_lm_device(dev);
  
  
@@ -49,16 +35,30 @@
 	struct lm_device *lmdev = to_lm_device(dev);
 	struct lm_driver *lmdrv = to_lm_driver(dev->driver);
  
-	lmdrv->remove(lmdev);
+	if (lmdrv->remove)
+		lmdrv->remove(lmdev);
 	return 0;
 }
  
+static struct bus_type lm_bustype = {
+	.name		= "logicmodule",
+	.match		= lm_match,
+	.probe		= lm_bus_probe,
+	.remove		= lm_bus_remove,
+//	.suspend	= lm_bus_suspend,
+//	.resume		= lm_bus_resume,
+};
+
+static int __init lm_init(void)
+{
+	return bus_register(&lm_bustype);
+}
+
+postcore_initcall(lm_init);
+
 int lm_driver_register(struct lm_driver *drv)
 {
 	drv->drv.bus = &lm_bustype;
-	drv->drv.probe = lm_bus_probe;
-	drv->drv.remove = lm_bus_remove;
-
 	return driver_register(&drv->drv);
 }
  
@@ -77,12 +77,6 @@
 	kfree(to_cx_dev(dev));
 }
  
-struct bus_type tiocx_bus_type = {
-	.name = "tiocx",
-	.match = tiocx_match,
-	.uevent = tiocx_uevent,
-};
-
 /**
  * cx_device_match - Find cx_device in the id table.
  * @ids: id table from driver
@@ -149,6 +143,14 @@
 	return 0;
 }
  
+struct bus_type tiocx_bus_type = {
+	.name = "tiocx",
+	.match = tiocx_match,
+	.uevent = tiocx_uevent,
+	.probe = cx_device_probe,
+	.remove = cx_driver_remove,
+};
+
 /**
  * cx_driver_register - Register the driver.
  * @cx_driver: driver table (cx_drv struct) from driver
@@ -162,8 +164,6 @@
 {
 	cx_driver->driver.name = cx_driver->name;
 	cx_driver->driver.bus = &tiocx_bus_type;
-	cx_driver->driver.probe = cx_device_probe;
-	cx_driver->driver.remove = cx_driver_remove;
  
 	return driver_register(&cx_driver->driver);
 }
@@ -173,8 +173,6 @@
 	WARN_ON(driver->drv.probe != NULL);
 	WARN_ON(driver->drv.remove != NULL);
  
-	driver->drv.probe = parisc_driver_probe;
-	driver->drv.remove = parisc_driver_remove;
 	driver->drv.name = driver->name;
  
 	return driver_register(&driver->drv);
@@ -575,6 +573,8 @@
 	.name = "parisc",
 	.match = parisc_generic_match,
 	.dev_attrs = parisc_device_attrs,
+	.probe = parisc_driver_probe,
+	.remove = parisc_driver_remove,
 };
  
 /**
@@ -132,6 +132,8 @@
 struct bus_type of_platform_bus_type = {
        .name	= "of_platform",
        .match	= of_platform_bus_match,
+       .probe	= of_device_probe,
+       .remove	= of_device_remove,
        .suspend	= of_device_suspend,
        .resume	= of_device_resume,
 };
@@ -150,8 +152,6 @@
 	/* initialize common driver fields */
 	drv->driver.name = drv->name;
 	drv->driver.bus = &of_platform_bus_type;
-	drv->driver.probe = of_device_probe;
-	drv->driver.remove = of_device_remove;
  
 	/* register with core */
 	count = driver_register(&drv->driver);
@@ -76,7 +76,7 @@
 	struct vio_dev *viodev = to_vio_dev(dev);
 	struct vio_driver *viodrv = to_vio_driver(dev->driver);
  
-	if (viodrv->shutdown)
+	if (dev->driver && viodrv->shutdown)
 		viodrv->shutdown(viodev);
 }
  
@@ -91,9 +91,6 @@
  
 	/* fill in 'struct driver' fields */
 	viodrv->driver.bus = &vio_bus_type;
-	viodrv->driver.probe = vio_bus_probe;
-	viodrv->driver.remove = vio_bus_remove;
-	viodrv->driver.shutdown = vio_bus_shutdown;
  
 	return driver_register(&viodrv->driver);
 }
@@ -295,5 +292,8 @@
 	.name = "vio",
 	.uevent = vio_hotplug,
 	.match = vio_bus_match,
+	.probe = vio_bus_probe,
+	.remove = vio_bus_remove,
+	.shutdown = vio_bus_shutdown,
 };
@@ -189,6 +189,8 @@
 struct bus_type ocp_bus_type = {
 	.name = "ocp",
 	.match = ocp_device_match,
+	.probe = ocp_driver_probe,
+	.remove = ocp_driver_remove,
 	.suspend = ocp_device_suspend,
 	.resume = ocp_device_resume,
 };
@@ -210,8 +212,6 @@
 	/* initialize common driver fields */
 	drv->driver.name = drv->name;
 	drv->driver.bus = &ocp_bus_type;
-	drv->driver.probe = ocp_device_probe;
-	drv->driver.remove = ocp_device_remove;
  
 	/* register with core */
 	return driver_register(&drv->driver);
@@ -53,21 +53,6 @@
 	return 0;
 }
  
-static struct device sh_bus_devices[SH_NR_BUSES] = {
-	{
-		.bus_id		= SH_BUS_NAME_VIRT,
-	},
-};
-
-struct bus_type sh_bus_types[SH_NR_BUSES] = {
-	{
-		.name		= SH_BUS_NAME_VIRT,
-		.match		= sh_bus_match,
-		.suspend	= sh_bus_suspend,
-		.resume		= sh_bus_resume,
-	},
-};
-
 static int sh_device_probe(struct device *dev)
 {
 	struct sh_dev *shdev = to_sh_dev(dev);
@@ -90,6 +75,23 @@
 	return 0;
 }
  
+static struct device sh_bus_devices[SH_NR_BUSES] = {
+	{
+		.bus_id		= SH_BUS_NAME_VIRT,
+	},
+};
+
+struct bus_type sh_bus_types[SH_NR_BUSES] = {
+	{
+		.name		= SH_BUS_NAME_VIRT,
+		.match		= sh_bus_match,
+		.probe		= sh_bus_probe,
+		.remove		= sh_bus_remove,
+		.suspend	= sh_bus_suspend,
+		.resume		= sh_bus_resume,
+	},
+};
+
 int sh_device_register(struct sh_dev *dev)
 {
 	if (!dev)
@@ -133,8 +135,6 @@
 		return -EINVAL;
 	}
  
-	drv->drv.probe  = sh_device_probe;
-	drv->drv.remove = sh_device_remove;
 	drv->drv.bus    = &sh_bus_types[drv->bus_id];
  
 	return driver_register(&drv->drv);
@@ -78,7 +78,13 @@
 	pr_debug("%s: Matched Device %s with Driver %s\n",
 		 drv->bus->name, dev->bus_id, drv->name);
 	dev->driver = drv;
-	if (drv->probe) {
+	if (dev->bus->probe) {
+		ret = dev->bus->probe(dev);
+		if (ret) {
+			dev->driver = NULL;
+			goto ProbeFailed;
+		}
+	} else if (drv->probe) {
 		ret = drv->probe(dev);
 		if (ret) {
 			dev->driver = NULL;
@@ -203,7 +209,9 @@
 		sysfs_remove_link(&dev->kobj, "driver");
 		klist_remove(&dev->knode_driver);
  
-		if (drv->remove)
+		if (dev->bus->remove)
+			dev->bus->remove(dev);
+		else if (drv->remove)
 			drv->remove(dev);
 		dev->driver = NULL;
 		put_driver(drv);
@@ -171,6 +171,11 @@
  */
 int driver_register(struct device_driver * drv)
 {
+	if ((drv->bus->probe && drv->probe) ||
+	    (drv->bus->remove && drv->remove) ||
+	    (drv->bus->shutdown && drv->shutdown)) {
+		printk(KERN_WARNING "Driver '%s' needs updating - please use bus_type methods\n", drv->name);
+	}
 	klist_init(&drv->klist_devices, klist_devices_get, klist_devices_put);
 	init_completion(&drv->unloaded);
 	return bus_add_driver(drv);
@@ -327,7 +327,7 @@
  *	@pdev:	platform device we're unregistering
  *
  *	Unregistration is done in 2 steps. Fisrt we release all resources
- *	and remove it from the sybsystem, then we drop reference count by
+ *	and remove it from the subsystem, then we drop reference count by
  *	calling platform_device_put().
  */
 void platform_device_unregister(struct platform_device * pdev)
@@ -35,12 +35,15 @@
  */
 void device_shutdown(void)
 {
-	struct device * dev;
+	struct device * dev, *devn;
  
 	down_write(&devices_subsys.rwsem);
-	list_for_each_entry_reverse(dev, &devices_subsys.kset.list,
+	list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.kset.list,
 				kobj.entry) {
-		if (dev->driver && dev->driver->shutdown) {
+		if (dev->bus && dev->bus->shutdown) {
+			dev_dbg(dev, "shutdown\n");
+			dev->bus->shutdown(dev);
+		} else if (dev->driver && dev->driver->shutdown) {
 			dev_dbg(dev, "shutdown\n");
 			dev->driver->shutdown(dev);
 		}
@@ -83,7 +83,6 @@
 	/* initialize common driver fields */
 	drv->driver.name = drv->name;
 	drv->driver.bus = &dio_bus_type;
-	drv->driver.probe = dio_device_probe;
  
 	/* register with core */
 	count = driver_register(&drv->driver);
@@ -145,7 +144,8 @@
  
 struct bus_type dio_bus_type = {
 	.name	= "dio",
-	.match	= dio_bus_match
+	.match	= dio_bus_match,
+	.probe	= dio_device_probe,
 };
  
  
@@ -63,13 +63,6 @@
 	return rc;
 }
  
-struct bus_type i2c_bus_type = {
-	.name =		"i2c",
-	.match =	i2c_device_match,
-	.suspend =      i2c_bus_suspend,
-	.resume =       i2c_bus_resume,
-};
-
 static int i2c_device_probe(struct device *dev)
 {
 	return -ENODEV;
@@ -80,6 +73,15 @@
 	return 0;
 }
  
+struct bus_type i2c_bus_type = {
+	.name =		"i2c",
+	.match =	i2c_device_match,
+	.probe =	i2c_device_probe,
+	.remove =	i2c_device_remove,
+	.suspend =      i2c_bus_suspend,
+	.resume =       i2c_bus_resume,
+};
+
 void i2c_adapter_dev_release(struct device *dev)
 {
 	struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
@@ -90,8 +92,6 @@
 	.owner = THIS_MODULE,
 	.name =	"i2c_adapter",
 	.bus = &i2c_bus_type,
-	.probe = i2c_device_probe,
-	.remove = i2c_device_remove,
 };
  
 static void i2c_adapter_class_dev_release(struct class_device *dev)
@@ -294,8 +294,6 @@
 	/* add the driver to the list of i2c drivers in the driver core */
 	driver->driver.owner = owner;
 	driver->driver.bus = &i2c_bus_type;
-	driver->driver.probe = i2c_device_probe;
-	driver->driver.remove = i2c_device_remove;
  
 	res = driver_register(&driver->driver);
 	if (res)
@@ -3256,9 +3256,8 @@
 }
 #endif
  
-static int ide_cd_remove(struct device *dev)
+static void ide_cd_remove(ide_drive_t *drive)
 {
-	ide_drive_t *drive = to_ide_device(dev);
 	struct cdrom_info *info = drive->driver_data;
  
 	ide_unregister_subdriver(drive, info->driver);
@@ -3266,8 +3265,6 @@
 	del_gendisk(info->disk);
  
 	ide_cd_put(info);
-
-	return 0;
 }
  
 static void ide_cd_release(struct kref *kref)
@@ -3291,7 +3288,7 @@
 	kfree(info);
 }
  
-static int ide_cd_probe(struct device *);
+static int ide_cd_probe(ide_drive_t *);
  
 #ifdef CONFIG_PROC_FS
 static int proc_idecd_read_capacity
  
@@ -3317,9 +3314,9 @@
 		.owner		= THIS_MODULE,
 		.name		= "ide-cdrom",
 		.bus		= &ide_bus_type,
-		.probe		= ide_cd_probe,
-		.remove		= ide_cd_remove,
 	},
+	.probe			= ide_cd_probe,
+	.remove			= ide_cd_remove,
 	.version		= IDECD_VERSION,
 	.media			= ide_cdrom,
 	.supports_dsc_overlap	= 1,
  
@@ -3413,9 +3410,8 @@
 module_param(ignore, charp, 0400);
 MODULE_DESCRIPTION("ATAPI CD-ROM Driver");
  
-static int ide_cd_probe(struct device *dev)
+static int ide_cd_probe(ide_drive_t *drive)
 {
-	ide_drive_t *drive = to_ide_device(dev);
 	struct cdrom_info *info;
 	struct gendisk *g;
 	struct request_sense sense;
@@ -997,9 +997,8 @@
 		printk(KERN_INFO "%s: wcache flush failed!\n", drive->name);
 }
  
-static int ide_disk_remove(struct device *dev)
+static void ide_disk_remove(ide_drive_t *drive)
 {
-	ide_drive_t *drive = to_ide_device(dev);
 	struct ide_disk_obj *idkp = drive->driver_data;
 	struct gendisk *g = idkp->disk;
  
@@ -1010,8 +1009,6 @@
 	ide_cacheflush_p(drive);
  
 	ide_disk_put(idkp);
-
-	return 0;
 }
  
 static void ide_disk_release(struct kref *kref)
  
  
@@ -1027,12 +1024,10 @@
 	kfree(idkp);
 }
  
-static int ide_disk_probe(struct device *dev);
+static int ide_disk_probe(ide_drive_t *drive);
  
-static void ide_device_shutdown(struct device *dev)
+static void ide_device_shutdown(ide_drive_t *drive)
 {
-	ide_drive_t *drive = container_of(dev, ide_drive_t, gendev);
-
 #ifdef	CONFIG_ALPHA
 	/* On Alpha, halt(8) doesn't actually turn the machine off,
 	   it puts you into the sort of firmware monitor. Typically,
@@ -1054,7 +1049,7 @@
 	}
  
 	printk("Shutdown: %s\n", drive->name);
-	dev->bus->suspend(dev, PMSG_SUSPEND);
+	drive->gendev.bus->suspend(&drive->gendev, PMSG_SUSPEND);
 }
  
 static ide_driver_t idedisk_driver = {
  
@@ -1062,10 +1057,10 @@
 		.owner		= THIS_MODULE,
 		.name		= "ide-disk",
 		.bus		= &ide_bus_type,
-		.probe		= ide_disk_probe,
-		.remove		= ide_disk_remove,
-		.shutdown	= ide_device_shutdown,
 	},
+	.probe			= ide_disk_probe,
+	.remove			= ide_disk_remove,
+	.shutdown		= ide_device_shutdown,
 	.version		= IDEDISK_VERSION,
 	.media			= ide_disk,
 	.supports_dsc_overlap	= 0,
  
@@ -1182,9 +1177,8 @@
  
 MODULE_DESCRIPTION("ATA DISK Driver");
  
-static int ide_disk_probe(struct device *dev)
+static int ide_disk_probe(ide_drive_t *drive)
 {
-	ide_drive_t *drive = to_ide_device(dev);
 	struct ide_disk_obj *idkp;
 	struct gendisk *g;
  
@@ -1871,9 +1871,8 @@
 	idefloppy_add_settings(drive);
 }
  
-static int ide_floppy_remove(struct device *dev)
+static void ide_floppy_remove(ide_drive_t *drive)
 {
-	ide_drive_t *drive = to_ide_device(dev);
 	idefloppy_floppy_t *floppy = drive->driver_data;
 	struct gendisk *g = floppy->disk;
  
@@ -1882,8 +1881,6 @@
 	del_gendisk(g);
  
 	ide_floppy_put(floppy);
-
-	return 0;
 }
  
 static void ide_floppy_release(struct kref *kref)
  
  
@@ -1922,16 +1919,16 @@
  
 #endif	/* CONFIG_PROC_FS */
  
-static int ide_floppy_probe(struct device *);
+static int ide_floppy_probe(ide_drive_t *);
  
 static ide_driver_t idefloppy_driver = {
 	.gen_driver = {
 		.owner		= THIS_MODULE,
 		.name		= "ide-floppy",
 		.bus		= &ide_bus_type,
-		.probe		= ide_floppy_probe,
-		.remove		= ide_floppy_remove,
 	},
+	.probe			= ide_floppy_probe,
+	.remove			= ide_floppy_remove,
 	.version		= IDEFLOPPY_VERSION,
 	.media			= ide_floppy,
 	.supports_dsc_overlap	= 0,
  
@@ -2136,9 +2133,8 @@
 	.revalidate_disk= idefloppy_revalidate_disk
 };
  
-static int ide_floppy_probe(struct device *dev)
+static int ide_floppy_probe(ide_drive_t *drive)
 {
-	ide_drive_t *drive = to_ide_device(dev);
 	idefloppy_floppy_t *floppy;
 	struct gendisk *g;
  
@@ -4682,9 +4682,8 @@
 	idetape_add_settings(drive);
 }
  
-static int ide_tape_remove(struct device *dev)
+static void ide_tape_remove(ide_drive_t *drive)
 {
-	ide_drive_t *drive = to_ide_device(dev);
 	idetape_tape_t *tape = drive->driver_data;
  
 	ide_unregister_subdriver(drive, tape->driver);
@@ -4692,8 +4691,6 @@
 	ide_unregister_region(tape->disk);
  
 	ide_tape_put(tape);
-
-	return 0;
 }
  
 static void ide_tape_release(struct kref *kref)
  
  
@@ -4745,16 +4742,16 @@
  
 #endif
  
-static int ide_tape_probe(struct device *);
+static int ide_tape_probe(ide_drive_t *);
  
 static ide_driver_t idetape_driver = {
 	.gen_driver = {
 		.owner		= THIS_MODULE,
 		.name		= "ide-tape",
 		.bus		= &ide_bus_type,
-		.probe		= ide_tape_probe,
-		.remove		= ide_tape_remove,
 	},
+	.probe			= ide_tape_probe,
+	.remove			= ide_tape_remove,
 	.version		= IDETAPE_VERSION,
 	.media			= ide_tape,
 	.supports_dsc_overlap 	= 1,
  
@@ -4825,9 +4822,8 @@
 	.ioctl		= idetape_ioctl,
 };
  
-static int ide_tape_probe(struct device *dev)
+static int ide_tape_probe(ide_drive_t *drive)
 {
-	ide_drive_t *drive = to_ide_device(dev);
 	idetape_tape_t *tape;
 	struct gendisk *g;
 	int minor;
  
@@ -4883,9 +4879,9 @@
 	idetape_setup(drive, tape, minor);
  
 	class_device_create(idetape_sysfs_class, NULL,
-			MKDEV(IDETAPE_MAJOR, minor), dev, "%s", tape->name);
+			MKDEV(IDETAPE_MAJOR, minor), &drive->gendev, "%s", tape->name);
 	class_device_create(idetape_sysfs_class, NULL,
-			MKDEV(IDETAPE_MAJOR, minor + 128), dev, "n%s", tape->name);
+			MKDEV(IDETAPE_MAJOR, minor + 128), &drive->gendev, "n%s", tape->name);
  
 	devfs_mk_cdev(MKDEV(HWIF(drive)->major, minor),
 			S_IFCHR | S_IRUGO | S_IWUGO,
@@ -1949,10 +1949,41 @@
 	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,
@@ -50,9 +50,7 @@
  
 static LIST_HEAD(gameport_list);
  
-static struct bus_type gameport_bus = {
-	.name =	"gameport",
-};
+static struct bus_type gameport_bus;
  
 static void gameport_add_port(struct gameport *gameport);
 static void gameport_destroy_port(struct gameport *gameport);
  
@@ -703,11 +701,15 @@
 	return 0;
 }
  
+static struct bus_type gameport_bus = {
+	.name =	"gameport",
+	.probe = gameport_driver_probe,
+	.remove = gameport_driver_remove,
+};
+
 void __gameport_register_driver(struct gameport_driver *drv, struct module *owner)
 {
 	drv->driver.bus = &gameport_bus;
-	drv->driver.probe = gameport_driver_probe;
-	drv->driver.remove = gameport_driver_remove;
 	gameport_queue_event(drv, owner, GAMEPORT_REGISTER_DRIVER);
 }
  
@@ -528,42 +528,58 @@
 INPUT_DEV_STRING_ATTR_SHOW(phys);
 INPUT_DEV_STRING_ATTR_SHOW(uniq);
  
-static int print_modalias_bits(char *buf, char prefix, unsigned long *arr,
+static int print_modalias_bits(char *buf, int size, char prefix, unsigned long *arr,
 			       unsigned int min, unsigned int max)
 {
 	int len, i;
  
-	len = sprintf(buf, "%c", prefix);
+	len = snprintf(buf, size, "%c", prefix);
 	for (i = min; i < max; i++)
 		if (arr[LONG(i)] & BIT(i))
-			len += sprintf(buf+len, "%X,", i);
+			len += snprintf(buf + len, size - len, "%X,", i);
 	return len;
 }
  
-static ssize_t input_dev_show_modalias(struct class_device *dev, char *buf)
+static int print_modalias(char *buf, int size, struct input_dev *id)
 {
-	struct input_dev *id = to_input_dev(dev);
-	ssize_t len = 0;
+	int len;
  
-	len += sprintf(buf+len, "input:b%04Xv%04Xp%04Xe%04X-",
+	len = snprintf(buf, size, "input:b%04Xv%04Xp%04Xe%04X-",
 		       id->id.bustype,
 		       id->id.vendor,
 		       id->id.product,
 		       id->id.version);
  
-	len += print_modalias_bits(buf+len, 'e', id->evbit, 0, EV_MAX);
-	len += print_modalias_bits(buf+len, 'k', id->keybit,
+	len += print_modalias_bits(buf + len, size - len, 'e', id->evbit,
+				   0, EV_MAX);
+	len += print_modalias_bits(buf + len, size - len, 'k', id->keybit,
 				   KEY_MIN_INTERESTING, KEY_MAX);
-	len += print_modalias_bits(buf+len, 'r', id->relbit, 0, REL_MAX);
-	len += print_modalias_bits(buf+len, 'a', id->absbit, 0, ABS_MAX);
-	len += print_modalias_bits(buf+len, 'm', id->mscbit, 0, MSC_MAX);
-	len += print_modalias_bits(buf+len, 'l', id->ledbit, 0, LED_MAX);
-	len += print_modalias_bits(buf+len, 's', id->sndbit, 0, SND_MAX);
-	len += print_modalias_bits(buf+len, 'f', id->ffbit, 0, FF_MAX);
-	len += print_modalias_bits(buf+len, 'w', id->swbit, 0, SW_MAX);
-	len += sprintf(buf+len, "\n");
+	len += print_modalias_bits(buf + len, size - len, 'r', id->relbit,
+				   0, REL_MAX);
+	len += print_modalias_bits(buf + len, size - len, 'a', id->absbit,
+				   0, ABS_MAX);
+	len += print_modalias_bits(buf + len, size - len, 'm', id->mscbit,
+				   0, MSC_MAX);
+	len += print_modalias_bits(buf + len, size - len, 'l', id->ledbit,
+				   0, LED_MAX);
+	len += print_modalias_bits(buf + len, size - len, 's', id->sndbit,
+				   0, SND_MAX);
+	len += print_modalias_bits(buf + len, size - len, 'f', id->ffbit,
+				   0, FF_MAX);
+	len += print_modalias_bits(buf + len, size - len, 'w', id->swbit,
+				   0, SW_MAX);
 	return len;
 }
+
+static ssize_t input_dev_show_modalias(struct class_device *dev, char *buf)
+{
+	struct input_dev *id = to_input_dev(dev);
+	ssize_t len;
+
+	len = print_modalias(buf, PAGE_SIZE, id);
+	len += snprintf(buf + len, PAGE_SIZE-len, "\n");
+	return len;
+}
 static CLASS_DEVICE_ATTR(modalias, S_IRUGO, input_dev_show_modalias, NULL);
  
 static struct attribute *input_dev_attrs[] = {
  
@@ -728,8 +744,11 @@
 	if (test_bit(EV_SW, dev->evbit))
 		INPUT_ADD_HOTPLUG_BM_VAR("SW=", dev->swbit, SW_MAX);
  
-	envp[i] = NULL;
+	envp[i++] = buffer + len;
+	len += snprintf(buffer + len, buffer_size - len, "MODALIAS=");
+	len += print_modalias(buffer + len, buffer_size - len, dev) + 1;
  
+	envp[i] = NULL;
 	return 0;
 }
  
@@ -59,9 +59,7 @@
  
 static LIST_HEAD(serio_list);
  
-static struct bus_type serio_bus = {
-	.name =	"serio",
-};
+static struct bus_type serio_bus;
  
 static void serio_add_port(struct serio *serio);
 static void serio_destroy_port(struct serio *serio);
  
@@ -750,11 +748,15 @@
 	return 0;
 }
  
+static struct bus_type serio_bus = {
+	.name =	"serio",
+	.probe = serio_driver_probe,
+	.remove = serio_driver_remove,
+};
+
 void __serio_register_driver(struct serio_driver *drv, struct module *owner)
 {
 	drv->driver.bus = &serio_bus;
-	drv->driver.probe = serio_driver_probe;
-	drv->driver.remove = serio_driver_remove;
  
 	serio_queue_event(drv, owner, SERIO_REGISTER_DRIVER);
 }
@@ -211,6 +211,9 @@
        .name	= "macio",
        .match	= macio_bus_match,
        .uevent = macio_uevent,
+       .probe	= macio_device_probe,
+       .remove	= macio_device_remove,
+       .shutdown = macio_device_shutdown,
        .suspend	= macio_device_suspend,
        .resume	= macio_device_resume,
        .dev_attrs = macio_dev_attrs,
@@ -528,9 +531,6 @@
 	/* initialize common driver fields */
 	drv->driver.name = drv->name;
 	drv->driver.bus = &macio_bus_type;
-	drv->driver.probe = macio_device_probe;
-	drv->driver.remove = macio_device_remove;
-	drv->driver.shutdown = macio_device_shutdown;
  
 	/* register with core */
 	count = driver_register(&drv->driver);
@@ -779,9 +779,8 @@
 	return 0;
 }
  
-static int dvb_bt8xx_probe(struct device *dev)
+static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
 {
-	struct bttv_sub_device *sub = to_bttv_sub_dev(dev);
 	struct dvb_bt8xx_card *card;
 	struct pci_dev* bttv_pci_dev;
 	int ret;
  
  
@@ -890,13 +889,13 @@
 		return ret;
 	}
  
-	dev_set_drvdata(dev, card);
+	dev_set_drvdata(&sub->dev, card);
 	return 0;
 }
  
-static int dvb_bt8xx_remove(struct device *dev)
+static int dvb_bt8xx_remove(struct bttv_sub_device *sub)
 {
-	struct dvb_bt8xx_card *card = dev_get_drvdata(dev);
+	struct dvb_bt8xx_card *card = dev_get_drvdata(&sub->dev);
  
 	dprintk("dvb_bt8xx: unloading card%d\n", card->bttv_nr);
  
  
@@ -919,14 +918,14 @@
 static struct bttv_sub_driver driver = {
 	.drv = {
 		.name		= "dvb-bt8xx",
-		.probe		= dvb_bt8xx_probe,
-		.remove		= dvb_bt8xx_remove,
-		/* FIXME:
-		 * .shutdown	= dvb_bt8xx_shutdown,
-		 * .suspend	= dvb_bt8xx_suspend,
-		 * .resume	= dvb_bt8xx_resume,
-		 */
 	},
+	.probe		= dvb_bt8xx_probe,
+	.remove		= dvb_bt8xx_remove,
+	/* FIXME:
+	 * .shutdown	= dvb_bt8xx_shutdown,
+	 * .suspend	= dvb_bt8xx_suspend,
+	 * .resume	= dvb_bt8xx_resume,
+	 */
 };
  
 static int __init dvb_bt8xx_init(void)
@@ -47,9 +47,29 @@
 	return 0;
 }
  
+static int bttv_sub_probe(struct device *dev)
+{
+	struct bttv_sub_device *sdev = to_bttv_sub_dev(dev);
+	struct bttv_sub_driver *sub = to_bttv_sub_drv(dev->driver);
+
+	return sub->probe ? sub->probe(sdev) : -ENODEV;
+}
+
+static int bttv_sub_remove(struct device *dev)
+{
+	struct bttv_sub_device *sdev = to_bttv_sub_dev(dev);
+	struct bttv_sub_driver *sub = to_bttv_sub_drv(dev->driver);
+
+	if (sub->remove)
+		sub->remove(sdev);
+	return 0;
+}
+
 struct bus_type bttv_sub_bus_type = {
-	.name  = "bttv-sub",
-	.match = &bttv_sub_bus_match,
+	.name   = "bttv-sub",
+	.match  = &bttv_sub_bus_match,
+	.probe  = bttv_sub_probe,
+	.remove = bttv_sub_remove,
 };
 EXPORT_SYMBOL(bttv_sub_bus_type);
  
@@ -365,6 +365,8 @@
 struct bttv_sub_driver {
 	struct device_driver   drv;
 	char                   wanted[BUS_ID_SIZE];
+	int                    (*probe)(struct bttv_sub_device *sub);
+	void                   (*remove)(struct bttv_sub_device *sub);
 	void                   (*gpio_irq)(struct bttv_sub_device *sub);
 };
 #define to_bttv_sub_drv(x) container_of((x), struct bttv_sub_driver, drv)
@@ -77,6 +77,8 @@
 static struct bus_type mcp_bus_type = {
 	.name		= "mcp",
 	.match		= mcp_bus_match,
+	.probe		= mcp_bus_probe,
+	.remove		= mcp_bus_remove,
 	.suspend	= mcp_bus_suspend,
 	.resume		= mcp_bus_resume,
 };
@@ -227,8 +229,6 @@
 int mcp_driver_register(struct mcp_driver *mcpdrv)
 {
 	mcpdrv->drv.bus = &mcp_bus_type;
-	mcpdrv->drv.probe = mcp_bus_probe;
-	mcpdrv->drv.remove = mcp_bus_remove;
 	return driver_register(&mcpdrv->drv);
 }
 EXPORT_SYMBOL(mcp_driver_register);
@@ -136,17 +136,7 @@
 	return ret;
 }
  
-static struct bus_type mmc_bus_type = {
-	.name		= "mmc",
-	.dev_attrs	= mmc_dev_attrs,
-	.match		= mmc_bus_match,
-	.uevent		= mmc_bus_uevent,
-	.suspend	= mmc_bus_suspend,
-	.resume		= mmc_bus_resume,
-};
-
-
-static int mmc_drv_probe(struct device *dev)
+static int mmc_bus_probe(struct device *dev)
 {
 	struct mmc_driver *drv = to_mmc_driver(dev->driver);
 	struct mmc_card *card = dev_to_mmc_card(dev);
@@ -154,7 +144,7 @@
 	return drv->probe(card);
 }
  
-static int mmc_drv_remove(struct device *dev)
+static int mmc_bus_remove(struct device *dev)
 {
 	struct mmc_driver *drv = to_mmc_driver(dev->driver);
 	struct mmc_card *card = dev_to_mmc_card(dev);
@@ -164,6 +154,16 @@
 	return 0;
 }
  
+static struct bus_type mmc_bus_type = {
+	.name		= "mmc",
+	.dev_attrs	= mmc_dev_attrs,
+	.match		= mmc_bus_match,
+	.uevent		= mmc_bus_uevent,
+	.probe		= mmc_bus_probe,
+	.remove		= mmc_bus_remove,
+	.suspend	= mmc_bus_suspend,
+	.resume		= mmc_bus_resume,
+};
  
 /**
  *	mmc_register_driver - register a media driver
@@ -172,8 +172,6 @@
 int mmc_register_driver(struct mmc_driver *drv)
 {
 	drv->drv.bus = &mmc_bus_type;
-	drv->drv.probe = mmc_drv_probe;
-	drv->drv.remove = mmc_drv_remove;
 	return driver_register(&drv->drv);
 }
  
@@ -380,8 +380,6 @@
 	/* initialize common driver fields */
 	drv->driver.name = drv->name;
 	drv->driver.bus = &pci_bus_type;
-	drv->driver.probe = pci_device_probe;
-	drv->driver.remove = pci_device_remove;
 	/* FIXME, once all of the existing PCI drivers have been fixed to set
 	 * the pci shutdown function, this test can go away. */
 	if (!drv->driver.shutdown)
@@ -513,6 +511,8 @@
 	.name		= "pci",
 	.match		= pci_bus_match,
 	.uevent		= pci_uevent,
+	.probe		= pci_device_probe,
+	.remove		= pci_device_remove,
 	.suspend	= pci_device_suspend,
 	.resume		= pci_device_resume,
 	.dev_attrs	= pci_dev_attrs,
@@ -311,8 +311,6 @@
 	/* initialize common fields */
 	driver->drv.bus = &pcmcia_bus_type;
 	driver->drv.owner = driver->owner;
-	driver->drv.probe = pcmcia_device_probe;
-	driver->drv.remove = pcmcia_device_remove;
  
 	return driver_register(&driver->drv);
 }
@@ -1200,6 +1198,8 @@
 	.uevent = pcmcia_bus_uevent,
 	.match = pcmcia_bus_match,
 	.dev_attrs = pcmcia_dev_attrs,
+	.probe = pcmcia_device_probe,
+	.remove = pcmcia_device_remove,
 	.suspend = pcmcia_dev_suspend,
 	.resume = pcmcia_dev_resume,
 };
@@ -195,6 +195,8 @@
 struct bus_type pnp_bus_type = {
 	.name	= "pnp",
 	.match	= pnp_bus_match,
+	.probe	= pnp_device_probe,
+	.remove	= pnp_device_remove,
 	.suspend = pnp_bus_suspend,
 	.resume = pnp_bus_resume,
 };
@@ -215,8 +217,6 @@
  
 	drv->driver.name = drv->name;
 	drv->driver.bus = &pnp_bus_type;
-	drv->driver.probe = pnp_device_probe;
-	drv->driver.remove = pnp_device_remove;
  
 	count = driver_register(&drv->driver);
  
@@ -147,8 +147,6 @@
 	/* initialize common driver fields */
 	rdrv->driver.name = rdrv->name;
 	rdrv->driver.bus = &rio_bus_type;
-	rdrv->driver.probe = rio_device_probe;
-	rdrv->driver.remove = rio_device_remove;
  
 	/* register with core */
 	return driver_register(&rdrv->driver);
@@ -204,7 +202,9 @@
 struct bus_type rio_bus_type = {
 	.name = "rapidio",
 	.match = rio_match_bus,
-	.dev_attrs = rio_dev_attrs
+	.dev_attrs = rio_dev_attrs,
+	.probe = rio_device_probe,
+	.remove = rio_device_remove,
 };
  
 /**
@@ -52,11 +52,7 @@
 	return 0;
 }
  
-static struct bus_type ccwgroup_bus_type = {
-	.name    = "ccwgroup",
-	.match   = ccwgroup_bus_match,
-	.uevent = ccwgroup_uevent,
-};
+static struct bus_type ccwgroup_bus_type;
  
 static inline void
 __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
@@ -389,6 +385,14 @@
 	return 0;
 }
  
+static struct bus_type ccwgroup_bus_type = {
+	.name   = "ccwgroup",
+	.match  = ccwgroup_bus_match,
+	.uevent = ccwgroup_uevent,
+	.probe  = ccwgroup_probe,
+	.remove = ccwgroup_remove,
+};
+
 int
 ccwgroup_driver_register (struct ccwgroup_driver *cdriver)
 {
@@ -396,8 +400,6 @@
 	cdriver->driver = (struct device_driver) {
 		.bus = &ccwgroup_bus_type,
 		.name = cdriver->name,
-		.probe = ccwgroup_probe,
-		.remove = ccwgroup_remove,
 	};
  
 	return driver_register(&cdriver->driver);
@@ -542,9 +542,41 @@
 	return 0;
 }
  
+static int
+css_probe (struct device *dev)
+{
+	struct subchannel *sch;
+
+	sch = to_subchannel(dev);
+	sch->driver = container_of (dev->driver, struct css_driver, drv);
+	return (sch->driver->probe ? sch->driver->probe(sch) : 0);
+}
+
+static int
+css_remove (struct device *dev)
+{
+	struct subchannel *sch;
+
+	sch = to_subchannel(dev);
+	return (sch->driver->remove ? sch->driver->remove(sch) : 0);
+}
+
+static void
+css_shutdown (struct device *dev)
+{
+	struct subchannel *sch;
+
+	sch = to_subchannel(dev);
+	if (sch->driver->shutdown)
+		sch->driver->shutdown(sch);
+}
+
 struct bus_type css_bus_type = {
-	.name  = "css",
-	.match = &css_bus_match,
+	.name     = "css",
+	.match    = css_bus_match,
+	.probe    = css_probe,
+	.remove   = css_remove,
+	.shutdown = css_shutdown,
 };
  
 subsys_initcall(init_channel_subsystem);
@@ -115,6 +115,7 @@
  * Currently, we only care about I/O subchannels (type 0), these
  * have a ccw_device connected to them.
  */
+struct subchannel;
 struct css_driver {
 	unsigned int subchannel_type;
 	struct device_driver drv;
@@ -122,6 +123,9 @@
 	int (*notify)(struct device *, int);
 	void (*verify)(struct device *);
 	void (*termination)(struct device *);
+	int (*probe)(struct subchannel *);
+	int (*remove)(struct subchannel *);
+	void (*shutdown)(struct subchannel *);
 };
  
 /*
@@ -107,33 +107,29 @@
 	return 0;
 }
  
-struct bus_type ccw_bus_type = {
-	.name  = "ccw",
-	.match = &ccw_bus_match,
-	.uevent = &ccw_uevent,
-};
+struct bus_type ccw_bus_type;
  
-static int io_subchannel_probe (struct device *);
-static int io_subchannel_remove (struct device *);
+static int io_subchannel_probe (struct subchannel *);
+static int io_subchannel_remove (struct subchannel *);
 void io_subchannel_irq (struct device *);
 static int io_subchannel_notify(struct device *, int);
 static void io_subchannel_verify(struct device *);
 static void io_subchannel_ioterm(struct device *);
-static void io_subchannel_shutdown(struct device *);
+static void io_subchannel_shutdown(struct subchannel *);
  
 struct css_driver io_subchannel_driver = {
 	.subchannel_type = SUBCHANNEL_TYPE_IO,
 	.drv = {
 		.name = "io_subchannel",
 		.bus  = &css_bus_type,
-		.probe = &io_subchannel_probe,
-		.remove = &io_subchannel_remove,
-		.shutdown = &io_subchannel_shutdown,
 	},
 	.irq = io_subchannel_irq,
 	.notify = io_subchannel_notify,
 	.verify = io_subchannel_verify,
 	.termination = io_subchannel_ioterm,
+	.probe = io_subchannel_probe,
+	.remove = io_subchannel_remove,
+	.shutdown = io_subchannel_shutdown,
 };
  
 struct workqueue_struct *ccw_device_work;
  
  
@@ -803,14 +799,12 @@
 }
  
 static int
-io_subchannel_probe (struct device *pdev)
+io_subchannel_probe (struct subchannel *sch)
 {
-	struct subchannel *sch;
 	struct ccw_device *cdev;
 	int rc;
 	unsigned long flags;
  
-	sch = to_subchannel(pdev);
 	if (sch->dev.driver_data) {
 		/*
 		 * This subchannel already has an associated ccw_device.
@@ -846,7 +840,7 @@
 	memset(cdev->private, 0, sizeof(struct ccw_device_private));
 	atomic_set(&cdev->private->onoff, 0);
 	cdev->dev = (struct device) {
-		.parent = pdev,
+		.parent = &sch->dev,
 		.release = ccw_device_release,
 	};
 	INIT_LIST_HEAD(&cdev->private->kick_work.entry);
@@ -859,7 +853,7 @@
 		return -ENODEV;
 	}
  
-	rc = io_subchannel_recog(cdev, to_subchannel(pdev));
+	rc = io_subchannel_recog(cdev, sch);
 	if (rc) {
 		spin_lock_irqsave(&sch->lock, flags);
 		sch->dev.driver_data = NULL;
  
  
  
@@ -883,17 +877,17 @@
 }
  
 static int
-io_subchannel_remove (struct device *dev)
+io_subchannel_remove (struct subchannel *sch)
 {
 	struct ccw_device *cdev;
 	unsigned long flags;
  
-	if (!dev->driver_data)
+	if (!sch->dev.driver_data)
 		return 0;
-	cdev = dev->driver_data;
+	cdev = sch->dev.driver_data;
 	/* Set ccw device to not operational and drop reference. */
 	spin_lock_irqsave(cdev->ccwlock, flags);
-	dev->driver_data = NULL;
+	sch->dev.driver_data = NULL;
 	cdev->private->state = DEV_STATE_NOT_OPER;
 	spin_unlock_irqrestore(cdev->ccwlock, flags);
 	/*
  
  
@@ -948,14 +942,12 @@
 }
  
 static void
-io_subchannel_shutdown(struct device *dev)
+io_subchannel_shutdown(struct subchannel *sch)
 {
-	struct subchannel *sch;
 	struct ccw_device *cdev;
 	int ret;
  
-	sch = to_subchannel(dev);
-	cdev = dev->driver_data;
+	cdev = sch->dev.driver_data;
  
 	if (cio_is_console(sch->schid))
 		return;
@@ -1129,6 +1121,14 @@
 	return 0;
 }
  
+struct bus_type ccw_bus_type = {
+	.name   = "ccw",
+	.match  = ccw_bus_match,
+	.uevent = ccw_uevent,
+	.probe  = ccw_device_probe,
+	.remove = ccw_device_remove,
+};
+
 int
 ccw_driver_register (struct ccw_driver *cdriver)
 {
@@ -1136,8 +1136,6 @@
  
 	drv->bus = &ccw_bus_type;
 	drv->name = cdriver->name;
-	drv->probe = ccw_device_probe;
-	drv->remove = ccw_device_remove;
  
 	return driver_register(drv);
 }
@@ -221,8 +221,6 @@
 static struct device_driver sdebug_driverfs_driver = {
 	.name 		= sdebug_proc_name,
 	.bus		= &pseudo_lld_bus,
-	.probe          = sdebug_driver_probe,
-	.remove         = sdebug_driver_remove,
 };
  
 static const int check_condition_result =
@@ -1796,6 +1794,8 @@
 static struct bus_type pseudo_lld_bus = {
         .name = "pseudo",
         .match = pseudo_lld_bus_match,
+	.probe = sdebug_driver_probe,
+	.remove = sdebug_driver_remove,
 };
  
 static void sdebug_release_adapter(struct device * dev)
@@ -175,8 +175,6 @@
 {
 	drv->drv.name	= drv->name;
 	drv->drv.bus	= &superhyway_bus_type;
-	drv->drv.probe	= superhyway_device_probe;
-	drv->drv.remove	= superhyway_device_remove;
  
 	return driver_register(&drv->drv);
 }
@@ -213,6 +211,8 @@
 #ifdef CONFIG_SYSFS
 	.dev_attrs	= superhyway_dev_attrs,
 #endif
+	.probe		= superhyway_device_probe,
+	.remove		= superhyway_device_remove,
 };
  
 static int __init superhyway_bus_init(void)
@@ -2534,9 +2534,6 @@
 	.driver 	= {
 		.name		= (char *) shortname,
 		.owner		= THIS_MODULE,
-		// .shutdown = ...
-		// .suspend = ...
-		// .resume = ...
 	},
 };
  
@@ -1738,9 +1738,6 @@
  
 	.driver 	= {
 		.name		= (char *) shortname,
-		// .shutdown = ...
-		// .suspend = ...
-		// .resume = ...
 	},
 };
  
@@ -374,9 +374,6 @@
 	.disconnect =		gs_disconnect,
 	.driver = {
 		.name =		GS_SHORT_NAME,
-		/* .shutdown = ... */
-		/* .suspend = ...  */
-		/* .resume = ...   */
 	},
 };
  
@@ -1303,9 +1303,6 @@
 	.driver 	= {
 		.name		= (char *) shortname,
 		.owner		= THIS_MODULE,
-		// .shutdown = ...
-		// .suspend = ...
-		// .resume = ...
 	},
 };
  
@@ -37,11 +37,6 @@
 	return 0;
 }
  
-struct bus_type usb_serial_bus_type = {
-	.name =		"usb-serial",
-	.match =	usb_serial_device_match,
-};
-
 static int usb_serial_device_probe (struct device *dev)
 {
 	struct usb_serial_driver *driver;
  
@@ -109,14 +104,18 @@
 	return retval;
 }
  
+struct bus_type usb_serial_bus_type = {
+	.name =		"usb-serial",
+	.match =	usb_serial_device_match,
+	.probe =	usb_serial_device_probe,
+	.remove =	usb_serial_device_remove,
+};
+
 int usb_serial_bus_register(struct usb_serial_driver *driver)
 {
 	int retval;
  
 	driver->driver.bus = &usb_serial_bus_type;
-	driver->driver.probe = usb_serial_device_probe;
-	driver->driver.remove = usb_serial_device_remove;
-
 	retval = driver_register(&driver->driver);
  
 	return retval;
@@ -77,7 +77,6 @@
 	/* initialize common driver fields */
 	drv->driver.name = drv->name;
 	drv->driver.bus = &zorro_bus_type;
-	drv->driver.probe = zorro_device_probe;
  
 	/* register with core */
 	count = driver_register(&drv->driver);
@@ -132,7 +131,8 @@
  
 struct bus_type zorro_bus_type = {
 	.name	= "zorro",
-	.match	= zorro_bus_match
+	.match	= zorro_bus_match,
+	.probe	= zorro_device_probe,
 };
  
  
@@ -49,6 +49,9 @@
 	int		(*match)(struct device * dev, struct device_driver * drv);
 	int		(*uevent)(struct device *dev, char **envp,
 				  int num_envp, char *buffer, int buffer_size);
+	int		(*probe)(struct device * dev);
+	int		(*remove)(struct device * dev);
+	void		(*shutdown)(struct device * dev);
 	int		(*suspend)(struct device * dev, pm_message_t state);
 	int		(*resume)(struct device * dev);
 };
@@ -983,7 +983,12 @@
 	ide_startstop_t	(*abort)(ide_drive_t *, struct request *rq);
 	ide_proc_entry_t	*proc;
 	struct device_driver	gen_driver;
+	int		(*probe)(ide_drive_t *);
+	void		(*remove)(ide_drive_t *);
+	void		(*shutdown)(ide_drive_t *);
 } ide_driver_t;
+
+#define to_ide_driver(drv) container_of(drv, ide_driver_t, gen_driver)
  
 int generic_ide_ioctl(ide_drive_t *, struct file *, struct block_device *, unsigned, unsigned long);
...	...	@@ -1103,14 +1103,14 @@
1103	1103	struct bus_type locomo_bus_type = {
1104	1104	.name = "locomo-bus",
1105	1105	.match = locomo_match,
	1106	+ .probe = locomo_bus_probe,
	1107	+ .remove = locomo_bus_remove,
1106	1108	.suspend = locomo_bus_suspend,
1107	1109	.resume = locomo_bus_resume,
1108	1110	};
1109	1111
1110	1112	int locomo_driver_register(struct locomo_driver *driver)
1111	1113	{
1112		- driver->drv.probe = locomo_bus_probe;
1113		- driver->drv.remove = locomo_bus_remove;
1114	1114	driver->drv.bus = &locomo_bus_type;
1115	1115	return driver_register(&driver->drv);
1116	1116	}
...	...	@@ -1247,14 +1247,14 @@
1247	1247	struct bus_type sa1111_bus_type = {
1248	1248	.name = "sa1111-rab",
1249	1249	.match = sa1111_match,
	1250	+ .probe = sa1111_bus_probe,
	1251	+ .remove = sa1111_bus_remove,
1250	1252	.suspend = sa1111_bus_suspend,
1251	1253	.resume = sa1111_bus_resume,
1252	1254	};
1253	1255
1254	1256	int sa1111_driver_register(struct sa1111_driver *driver)
1255	1257	{
1256		- driver->drv.probe = sa1111_bus_probe;
1257		- driver->drv.remove = sa1111_bus_remove;
1258	1258	driver->drv.bus = &sa1111_bus_type;
1259	1259	return driver_register(&driver->drv);
1260	1260	}
...	...	@@ -1147,9 +1147,11 @@
1147	1147	struct ecard_driver *drv = ECARD_DRV(dev->driver);
1148	1148	struct ecard_request req;
1149	1149
1150		- if (drv->shutdown)
1151		- drv->shutdown(ec);
1152		- ecard_release(ec);
	1150	+ if (dev->driver) {
	1151	+ if (drv->shutdown)
	1152	+ drv->shutdown(ec);
	1153	+ ecard_release(ec);
	1154	+ }
1153	1155
1154	1156	/*
1155	1157	* If this card has a loader, call the reset handler.
...	...	@@ -1164,9 +1166,6 @@
1164	1166	int ecard_register_driver(struct ecard_driver *drv)
1165	1167	{
1166	1168	drv->drv.bus = &ecard_bus_type;
1167		- drv->drv.probe = ecard_drv_probe;
1168		- drv->drv.remove = ecard_drv_remove;
1169		- drv->drv.shutdown = ecard_drv_shutdown;
1170	1169
1171	1170	return driver_register(&drv->drv);
1172	1171	}
...	...	@@ -1195,6 +1194,9 @@
1195	1194	.name = "ecard",
1196	1195	.dev_attrs = ecard_dev_attrs,
1197	1196	.match = ecard_match,
	1197	+ .probe = ecard_drv_probe,
	1198	+ .remove = ecard_drv_remove,
	1199	+ .shutdown = ecard_drv_shutdown,
1198	1200	};
1199	1201
1200	1202	static int ecard_bus_init(void)
...	...	@@ -22,20 +22,6 @@
22	22	return 1;
23	23	}
24	24
25		-static struct bus_type lm_bustype = {
26		- .name = "logicmodule",
27		- .match = lm_match,
28		-// .suspend = lm_suspend,
29		-// .resume = lm_resume,
30		-};
31		-
32		-static int __init lm_init(void)
33		-{
34		- return bus_register(&lm_bustype);
35		-}
36		-
37		-postcore_initcall(lm_init);
38		-
39	25	static int lm_bus_probe(struct device *dev)
40	26	{
41	27	struct lm_device *lmdev = to_lm_device(dev);
42	28
43	29
...	...	@@ -49,16 +35,30 @@
49	35	struct lm_device *lmdev = to_lm_device(dev);
50	36	struct lm_driver *lmdrv = to_lm_driver(dev->driver);
51	37
52		- lmdrv->remove(lmdev);
	38	+ if (lmdrv->remove)
	39	+ lmdrv->remove(lmdev);
53	40	return 0;
54	41	}
55	42
	43	+static struct bus_type lm_bustype = {
	44	+ .name = "logicmodule",
	45	+ .match = lm_match,
	46	+ .probe = lm_bus_probe,
	47	+ .remove = lm_bus_remove,
	48	+// .suspend = lm_bus_suspend,
	49	+// .resume = lm_bus_resume,
	50	+};
	51	+
	52	+static int __init lm_init(void)
	53	+{
	54	+ return bus_register(&lm_bustype);
	55	+}
	56	+
	57	+postcore_initcall(lm_init);
	58	+
56	59	int lm_driver_register(struct lm_driver *drv)
57	60	{
58	61	drv->drv.bus = &lm_bustype;
59		- drv->drv.probe = lm_bus_probe;
60		- drv->drv.remove = lm_bus_remove;
61		-
62	62	return driver_register(&drv->drv);
63	63	}
64	64
...	...	@@ -77,12 +77,6 @@
77	77	kfree(to_cx_dev(dev));
78	78	}
79	79
80		-struct bus_type tiocx_bus_type = {
81		- .name = "tiocx",
82		- .match = tiocx_match,
83		- .uevent = tiocx_uevent,
84		-};
85		-
86	80	/**
87	81	* cx_device_match - Find cx_device in the id table.
88	82	* @ids: id table from driver
...	...	@@ -149,6 +143,14 @@
149	143	return 0;
150	144	}
151	145
	146	+struct bus_type tiocx_bus_type = {
	147	+ .name = "tiocx",
	148	+ .match = tiocx_match,
	149	+ .uevent = tiocx_uevent,
	150	+ .probe = cx_device_probe,
	151	+ .remove = cx_driver_remove,
	152	+};
	153	+
152	154	/**
153	155	* cx_driver_register - Register the driver.
154	156	* @cx_driver: driver table (cx_drv struct) from driver
...	...	@@ -162,8 +164,6 @@
162	164	{
163	165	cx_driver->driver.name = cx_driver->name;
164	166	cx_driver->driver.bus = &tiocx_bus_type;
165		- cx_driver->driver.probe = cx_device_probe;
166		- cx_driver->driver.remove = cx_driver_remove;
167	167
168	168	return driver_register(&cx_driver->driver);
169	169	}
...	...	@@ -173,8 +173,6 @@
173	173	WARN_ON(driver->drv.probe != NULL);
174	174	WARN_ON(driver->drv.remove != NULL);
175	175
176		- driver->drv.probe = parisc_driver_probe;
177		- driver->drv.remove = parisc_driver_remove;
178	176	driver->drv.name = driver->name;
179	177
180	178	return driver_register(&driver->drv);
...	...	@@ -575,6 +573,8 @@
575	573	.name = "parisc",
576	574	.match = parisc_generic_match,
577	575	.dev_attrs = parisc_device_attrs,
	576	+ .probe = parisc_driver_probe,
	577	+ .remove = parisc_driver_remove,
578	578	};
579	579
580	580	/**
...	...	@@ -132,6 +132,8 @@
132	132	struct bus_type of_platform_bus_type = {
133	133	.name = "of_platform",
134	134	.match = of_platform_bus_match,
	135	+ .probe = of_device_probe,
	136	+ .remove = of_device_remove,
135	137	.suspend = of_device_suspend,
136	138	.resume = of_device_resume,
137	139	};
...	...	@@ -150,8 +152,6 @@
150	152	/* initialize common driver fields */
151	153	drv->driver.name = drv->name;
152	154	drv->driver.bus = &of_platform_bus_type;
153		- drv->driver.probe = of_device_probe;
154		- drv->driver.remove = of_device_remove;
155	155
156	156	/* register with core */
157	157	count = driver_register(&drv->driver);
...	...	@@ -76,7 +76,7 @@
76	76	struct vio_dev *viodev = to_vio_dev(dev);
77	77	struct vio_driver *viodrv = to_vio_driver(dev->driver);
78	78
79		- if (viodrv->shutdown)
	79	+ if (dev->driver && viodrv->shutdown)
80	80	viodrv->shutdown(viodev);
81	81	}
82	82
...	...	@@ -91,9 +91,6 @@
91	91
92	92	/* fill in 'struct driver' fields */
93	93	viodrv->driver.bus = &vio_bus_type;
94		- viodrv->driver.probe = vio_bus_probe;
95		- viodrv->driver.remove = vio_bus_remove;
96		- viodrv->driver.shutdown = vio_bus_shutdown;
97	94
98	95	return driver_register(&viodrv->driver);
99	96	}
...	...	@@ -295,5 +292,8 @@
295	292	.name = "vio",
296	293	.uevent = vio_hotplug,
297	294	.match = vio_bus_match,
	295	+ .probe = vio_bus_probe,
	296	+ .remove = vio_bus_remove,
	297	+ .shutdown = vio_bus_shutdown,
298	298	};
...	...	@@ -189,6 +189,8 @@
189	189	struct bus_type ocp_bus_type = {
190	190	.name = "ocp",
191	191	.match = ocp_device_match,
	192	+ .probe = ocp_driver_probe,
	193	+ .remove = ocp_driver_remove,
192	194	.suspend = ocp_device_suspend,
193	195	.resume = ocp_device_resume,
194	196	};
...	...	@@ -210,8 +212,6 @@
210	212	/* initialize common driver fields */
211	213	drv->driver.name = drv->name;
212	214	drv->driver.bus = &ocp_bus_type;
213		- drv->driver.probe = ocp_device_probe;
214		- drv->driver.remove = ocp_device_remove;
215	215
216	216	/* register with core */
217	217	return driver_register(&drv->driver);
...	...	@@ -53,21 +53,6 @@
53	53	return 0;
54	54	}
55	55
56		-static struct device sh_bus_devices[SH_NR_BUSES] = {
57		- {
58		- .bus_id = SH_BUS_NAME_VIRT,
59		- },
60		-};
61		-
62		-struct bus_type sh_bus_types[SH_NR_BUSES] = {
63		- {
64		- .name = SH_BUS_NAME_VIRT,
65		- .match = sh_bus_match,
66		- .suspend = sh_bus_suspend,
67		- .resume = sh_bus_resume,
68		- },
69		-};
70		-
71	56	static int sh_device_probe(struct device *dev)
72	57	{
73	58	struct sh_dev *shdev = to_sh_dev(dev);
...	...	@@ -90,6 +75,23 @@
90	75	return 0;
91	76	}
92	77
	78	+static struct device sh_bus_devices[SH_NR_BUSES] = {
	79	+ {
	80	+ .bus_id = SH_BUS_NAME_VIRT,
	81	+ },
	82	+};
	83	+
	84	+struct bus_type sh_bus_types[SH_NR_BUSES] = {
	85	+ {
	86	+ .name = SH_BUS_NAME_VIRT,
	87	+ .match = sh_bus_match,
	88	+ .probe = sh_bus_probe,
	89	+ .remove = sh_bus_remove,
	90	+ .suspend = sh_bus_suspend,
	91	+ .resume = sh_bus_resume,
	92	+ },
	93	+};
	94	+
93	95	int sh_device_register(struct sh_dev *dev)
94	96	{
95	97	if (!dev)
...	...	@@ -133,8 +135,6 @@
133	135	return -EINVAL;
134	136	}
135	137
136		- drv->drv.probe = sh_device_probe;
137		- drv->drv.remove = sh_device_remove;
138	138	drv->drv.bus = &sh_bus_types[drv->bus_id];
139	139
140	140	return driver_register(&drv->drv);