remoteproc: Simplify default name allocation (4df4f8be) · Commits · 戴 / test

In an effort to cleanup firmware name allocation, replace the cumbersome mechanic used to allocate a default firmware name with function kasprintf(). Reviewed-by:

Alex Elder <elder@linaro.org> Reviewed-by:

Bjorn Andersson <bjorn.andersson@linaro.org> Suggested-by:

Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by:

Mathieu Poirier <mathieu.poirier@linaro.org> Link: https://lore.kernel.org/r/20200415204858.2448-4-mathieu.poirier@linaro.org Signed-off-by:

Bjorn Andersson <bjorn.andersson@linaro.org>

drivers/remoteproc/remoteproc_core.c

+7 −12

Original line number	Original line	Diff line number	Diff line
	@@ -1982,24 +1982,19 @@ static const struct device_type rproc_type = {
	static int rproc_alloc_firmware(struct rproc *rproc,		static int rproc_alloc_firmware(struct rproc *rproc,
	const char name, const char firmware)		const char name, const char firmware)
	{		{
	char p, template = "rproc-%s-fw";		char *p;
	int name_len;

	if (!firmware) {		if (!firmware)
	/*		/*
	* If the caller didn't pass in a firmware name then		* If the caller didn't pass in a firmware name then
	* construct a default name.		* construct a default name.
	*/		*/
	name_len = strlen(name) + strlen(template) - 2 + 1;		p = kasprintf(GFP_KERNEL, "rproc-%s-fw", name);
	p = kmalloc(name_len, GFP_KERNEL);		else
	if (!p)
	return -ENOMEM;
	snprintf(p, name_len, template, name);
	} else {
	p = kstrdup(firmware, GFP_KERNEL);		p = kstrdup(firmware, GFP_KERNEL);

	if (!p)		if (!p)
	return -ENOMEM;		return -ENOMEM;
	}

	rproc->firmware = p;		rproc->firmware = p;

Admin message