diff options
-rw-r--r-- | arch/arm/common/amba.c | 6 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/tiocx.c | 4 | ||||
-rw-r--r-- | drivers/s390/cio/ccwgroup.c | 4 | ||||
-rw-r--r-- | drivers/s390/cio/device.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/common/amba.c b/arch/arm/common/amba.c index e1013112c354..c95ec9eab996 100644 --- a/arch/arm/common/amba.c +++ b/arch/arm/common/amba.c | |||
@@ -45,7 +45,7 @@ static int amba_match(struct device *dev, struct device_driver *drv) | |||
45 | } | 45 | } |
46 | 46 | ||
47 | #ifdef CONFIG_HOTPLUG | 47 | #ifdef CONFIG_HOTPLUG |
48 | static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf, int bufsz) | 48 | static int amba_uevent(struct device *dev, char **envp, int nr_env, char *buf, int bufsz) |
49 | { | 49 | { |
50 | struct amba_device *pcdev = to_amba_device(dev); | 50 | struct amba_device *pcdev = to_amba_device(dev); |
51 | 51 | ||
@@ -58,7 +58,7 @@ static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf, | |||
58 | return 0; | 58 | return 0; |
59 | } | 59 | } |
60 | #else | 60 | #else |
61 | #define amba_hotplug NULL | 61 | #define amba_uevent NULL |
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | static int amba_suspend(struct device *dev, pm_message_t state) | 64 | static int amba_suspend(struct device *dev, pm_message_t state) |
@@ -88,7 +88,7 @@ static int amba_resume(struct device *dev) | |||
88 | static struct bus_type amba_bustype = { | 88 | static struct bus_type amba_bustype = { |
89 | .name = "amba", | 89 | .name = "amba", |
90 | .match = amba_match, | 90 | .match = amba_match, |
91 | .hotplug = amba_hotplug, | 91 | .uevent = amba_uevent, |
92 | .suspend = amba_suspend, | 92 | .suspend = amba_suspend, |
93 | .resume = amba_resume, | 93 | .resume = amba_resume, |
94 | }; | 94 | }; |
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c index 0d8592a745a7..768c21deb2e5 100644 --- a/arch/ia64/sn/kernel/tiocx.c +++ b/arch/ia64/sn/kernel/tiocx.c | |||
@@ -65,7 +65,7 @@ static int tiocx_match(struct device *dev, struct device_driver *drv) | |||
65 | 65 | ||
66 | } | 66 | } |
67 | 67 | ||
68 | static int tiocx_hotplug(struct device *dev, char **envp, int num_envp, | 68 | static int tiocx_uevent(struct device *dev, char **envp, int num_envp, |
69 | char *buffer, int buffer_size) | 69 | char *buffer, int buffer_size) |
70 | { | 70 | { |
71 | return -ENODEV; | 71 | return -ENODEV; |
@@ -79,7 +79,7 @@ static void tiocx_bus_release(struct device *dev) | |||
79 | struct bus_type tiocx_bus_type = { | 79 | struct bus_type tiocx_bus_type = { |
80 | .name = "tiocx", | 80 | .name = "tiocx", |
81 | .match = tiocx_match, | 81 | .match = tiocx_match, |
82 | .hotplug = tiocx_hotplug, | 82 | .uevent = tiocx_uevent, |
83 | }; | 83 | }; |
84 | 84 | ||
85 | /** | 85 | /** |
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c index e7bd7f37f080..be9d2d65c22f 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) | |||
45 | return 0; | 45 | return 0; |
46 | } | 46 | } |
47 | static int | 47 | static int |
48 | ccwgroup_hotplug (struct device *dev, char **envp, int num_envp, char *buffer, | 48 | ccwgroup_uevent (struct device *dev, char **envp, int num_envp, char *buffer, |
49 | int buffer_size) | 49 | int buffer_size) |
50 | { | 50 | { |
51 | /* TODO */ | 51 | /* TODO */ |
@@ -55,7 +55,7 @@ ccwgroup_hotplug (struct device *dev, char **envp, int num_envp, char *buffer, | |||
55 | static struct bus_type ccwgroup_bus_type = { | 55 | static struct bus_type ccwgroup_bus_type = { |
56 | .name = "ccwgroup", | 56 | .name = "ccwgroup", |
57 | .match = ccwgroup_bus_match, | 57 | .match = ccwgroup_bus_match, |
58 | .hotplug = ccwgroup_hotplug, | 58 | .uevent = ccwgroup_uevent, |
59 | }; | 59 | }; |
60 | 60 | ||
61 | static inline void | 61 | static inline void |
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 811c9d150637..85908cacc3b8 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) | |||
59 | * Heavily modeled on pci and usb hotplug. | 59 | * Heavily modeled on pci and usb hotplug. |
60 | */ | 60 | */ |
61 | static int | 61 | static int |
62 | ccw_hotplug (struct device *dev, char **envp, int num_envp, | 62 | ccw_uevent (struct device *dev, char **envp, int num_envp, |
63 | char *buffer, int buffer_size) | 63 | char *buffer, int buffer_size) |
64 | { | 64 | { |
65 | struct ccw_device *cdev = to_ccwdev(dev); | 65 | struct ccw_device *cdev = to_ccwdev(dev); |
@@ -110,7 +110,7 @@ ccw_hotplug (struct device *dev, char **envp, int num_envp, | |||
110 | struct bus_type ccw_bus_type = { | 110 | struct bus_type ccw_bus_type = { |
111 | .name = "ccw", | 111 | .name = "ccw", |
112 | .match = &ccw_bus_match, | 112 | .match = &ccw_bus_match, |
113 | .hotplug = &ccw_hotplug, | 113 | .uevent = &ccw_uevent, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | static int io_subchannel_probe (struct device *); | 116 | static int io_subchannel_probe (struct device *); |