Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d20b035 authored by Paul Jackson's avatar Paul Jackson Committed by Greg Kroah-Hartman
Browse files

[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: default avatarPaul Jackson <pj@sgi.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 712f47ce

arch/arm/common/amba.c

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int amba_match(struct device *dev, struct device_driver *drv) 
}



#ifdef CONFIG_HOTPLUG

static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf, int bufsz)

static int amba_uevent(struct device *dev, char **envp, int nr_env, char *buf, int bufsz)

{

	struct amba_device *pcdev = to_amba_device(dev);
@@ -58,7 +58,7 @@ static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf, 
	return 0;

}

#else

#define amba_hotplug NULL

#define amba_uevent NULL

#endif



static int amba_suspend(struct device *dev, pm_message_t state)
@@ -88,7 +88,7 @@ static int amba_resume(struct device *dev) 
static struct bus_type amba_bustype = {

	.name		= "amba",

	.match		= amba_match,

	.hotplug	= amba_hotplug,

	.uevent		= amba_uevent,

	.suspend	= amba_suspend,

	.resume		= amba_resume,

};

arch/ia64/sn/kernel/tiocx.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int tiocx_match(struct device *dev, struct device_driver *drv) 


}



static int tiocx_hotplug(struct device *dev, char **envp, int num_envp,

static int tiocx_uevent(struct device *dev, char **envp, int num_envp,

			 char *buffer, int buffer_size)

{

	return -ENODEV;
@@ -79,7 +79,7 @@ static void tiocx_bus_release(struct device *dev) 
struct bus_type tiocx_bus_type = {

	.name = "tiocx",

	.match = tiocx_match,

	.hotplug = tiocx_hotplug,

	.uevent = tiocx_uevent,

};



/**

drivers/s390/cio/ccwgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/s390/cio/device.c

+2 −2
Original line number Diff line number Diff line
@@ -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 *);