uevent environment changes fallout (7ac0326c) · Commits · 戴 / test

drivers/mmc/core/sdio_bus.c

+4 −11

Original line number	Diff line number	Diff line
		@@ -96,30 +96,23 @@ static int sdio_bus_match(struct device dev, struct device_driver drv)
		}

		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,
		if (add_uevent_var(env,
		"SDIO_CLASS=%02X", func->class))
		return -ENOMEM;

		if (add_uevent_var(envp, num_envp, &i,
		buf, buf_size, &length,
		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,
		if (add_uevent_var(env,
		"MODALIAS=sdio:c%02Xv%04Xd%04X",
		func->class, func->vendor, func->device))
		return -ENOMEM;

		envp[i] = NULL;

		return 0;
		}

+2 −8

Original line number	Diff line number	Diff line
		@@ -321,23 +321,17 @@ static int ssb_bus_match(struct device dev, struct device_driver drv)
		return 0;
		}

		static int ssb_device_uevent(struct device dev, char *envp, int num_envp,
		char *buffer, int buffer_size)
		static int ssb_device_uevent(struct device dev, struct kobj_uevent_env env)
		{
		struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
		int ret, i = 0, length = 0;

		if (!dev)
		return -ENODEV;

		ret = add_uevent_var(envp, num_envp, &i,
		buffer, buffer_size, &length,
		return add_uevent_var(env,
		"MODALIAS=ssb:v%04Xid%04Xrev%02X",
		ssb_dev->id.vendor, ssb_dev->id.coreid,
		ssb_dev->id.revision);
		envp[i] = NULL;

		return ret;
		}

		static struct bus_type ssb_bustype = {