Merge tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core (c8391797) · Commits · 戴 / test

drivers/base/core.c

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1865,6 +1865,7 @@ int __dev_printk(const char level, const struct device dev,
	struct va_format *vaf)		struct va_format *vaf)
	{		{
	char dict[128];		char dict[128];
			const char *level_extra = "";
	size_t dictlen = 0;		size_t dictlen = 0;
	const char *subsys;		const char *subsys;

	@@ -1911,10 +1912,14 @@ int __dev_printk(const char level, const struct device dev,
	"DEVICE=+%s:%s", subsys, dev_name(dev));		"DEVICE=+%s:%s", subsys, dev_name(dev));
	}		}
	skip:		skip:
			if (level[3])
			level_extra = &level[3]; /* skip past "<L>" */

	return printk_emit(0, level[1] - '0',		return printk_emit(0, level[1] - '0',
	dictlen ? dict : NULL, dictlen,		dictlen ? dict : NULL, dictlen,
	"%s %s: %pV",		"%s %s: %s%pV",
	dev_driver_string(dev), dev_name(dev), vaf);		dev_driver_string(dev), dev_name(dev),
			level_extra, vaf);
	}		}
	EXPORT_SYMBOL(__dev_printk);		EXPORT_SYMBOL(__dev_printk);

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -107,7 +107,8 @@ static int __devinit gpio_extcon_probe(struct platform_device *pdev)
	if (ret < 0)		if (ret < 0)
	return ret;		return ret;

	ret = gpio_request_one(extcon_data->gpio, GPIOF_DIR_IN, pdev->name);		ret = devm_gpio_request_one(&pdev->dev, extcon_data->gpio, GPIOF_DIR_IN,
			pdev->name);
	if (ret < 0)		if (ret < 0)
	goto err;		goto err;