From: Andrew Morton whoever merges second will need this.. Cc: Kay Sievers Cc: Greg KH Cc: Pierre Ossman Signed-off-by: Andrew Morton --- drivers/mmc/core/sdio_bus.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff -puN drivers/mmc/core/sdio_bus.c~gregkh-driver-driver-core-change-add_uevent_var-to-use-a-struct-vs-git-mmc drivers/mmc/core/sdio_bus.c --- a/drivers/mmc/core/sdio_bus.c~gregkh-driver-driver-core-change-add_uevent_var-to-use-a-struct-vs-git-mmc +++ a/drivers/mmc/core/sdio_bus.c @@ -96,30 +96,21 @@ static int sdio_bus_match(struct device } static int -sdio_bus_uevent(struct device *dev, char **envp, int num_envp, char *buf, - int buf_size) +sdio_bus_uevent(struct device *dev, struct kobj_uevent_env *env) { struct sdio_func *func = dev_to_sdio_func(dev); - int i = 0, length = 0; - if (add_uevent_var(envp, num_envp, &i, - buf, buf_size, &length, - "SDIO_CLASS=%02X", func->class)) + if (add_uevent_var(env, "SDIO_CLASS=%02X", func->class)) return -ENOMEM; - if (add_uevent_var(envp, num_envp, &i, - buf, buf_size, &length, - "SDIO_ID=%04X:%04X", func->vendor, func->device)) + if (add_uevent_var(env, "SDIO_ID=%04X:%04X", + func->vendor, func->device)) return -ENOMEM; - if (add_uevent_var(envp, num_envp, &i, - buf, buf_size, &length, - "MODALIAS=sdio:c%02Xv%04Xd%04X", + if (add_uevent_var(env, "MODALIAS=sdio:c%02Xv%04Xd%04X", func->class, func->vendor, func->device)) return -ENOMEM; - envp[i] = NULL; - return 0; } _