summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPaul Jackson <pj@sgi.com>2005-11-25 20:04:26 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-04 16:18:08 -0800
commit6d20b035dee4300e9786c6e1cb77a765c7f9460a (patch)
tree104596b8fca1f4946da8d499a8429e5decf7e2d9 /drivers
parent712f47cea7703a340406fde61e84eb86ce781988 (diff)
downloadop-kernel-dev-6d20b035dee4300e9786c6e1cb77a765c7f9460a.zip
op-kernel-dev-6d20b035dee4300e9786c6e1cb77a765c7f9460a.tar.gz
[PATCH] driver kill hotplug word from sn and others fix
The first of these changes s/hotplug/uevent/ was needed to compile sn2_defconfig (ia64/sn). The other three files changed are blind changes of all remaining bus_type.hotplug references I could find to bus_type.uevent. This patch attempts to finish similar changes made in the gregkh-driver-kill-hotplug-word-from-driver-core Nov 22 patch. Signed-off-by: Paul Jackson <pj@sgi.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/cio/ccwgroup.c4
-rw-r--r--drivers/s390/cio/device.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index e7bd7f3..be9d2d6 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -45,7 +45,7 @@ ccwgroup_bus_match (struct device * dev, struct device_driver * drv)
return 0;
}
static int
-ccwgroup_hotplug (struct device *dev, char **envp, int num_envp, char *buffer,
+ccwgroup_uevent (struct device *dev, char **envp, int num_envp, char *buffer,
int buffer_size)
{
/* TODO */
@@ -55,7 +55,7 @@ ccwgroup_hotplug (struct device *dev, char **envp, int num_envp, char *buffer,
static struct bus_type ccwgroup_bus_type = {
.name = "ccwgroup",
.match = ccwgroup_bus_match,
- .hotplug = ccwgroup_hotplug,
+ .uevent = ccwgroup_uevent,
};
static inline void
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 811c9d1..85908ca 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -59,7 +59,7 @@ ccw_bus_match (struct device * dev, struct device_driver * drv)
* Heavily modeled on pci and usb hotplug.
*/
static int
-ccw_hotplug (struct device *dev, char **envp, int num_envp,
+ccw_uevent (struct device *dev, char **envp, int num_envp,
char *buffer, int buffer_size)
{
struct ccw_device *cdev = to_ccwdev(dev);
@@ -110,7 +110,7 @@ ccw_hotplug (struct device *dev, char **envp, int num_envp,
struct bus_type ccw_bus_type = {
.name = "ccw",
.match = &ccw_bus_match,
- .hotplug = &ccw_hotplug,
+ .uevent = &ccw_uevent,
};
static int io_subchannel_probe (struct device *);
OpenPOWER on IntegriCloud