Commit bc8f7abe authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Rafael J. Wysocki
Browse files

ACPI: sysfs: Clean up create_pnp_modalias() and create_of_modalias() 



'modalias' is only written with snprintf() and it is already guaranteed
to be nul-terminated, so remove the unneeded (but harmless) writes of a
trailing '\0' to it.

Also snprintf() never returns negative values, so remove redundant (but
harmless) checks for it.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
[ rjw: Merge two patches into one, combine changelogs, add subject ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 48cf49d3

drivers/acpi/device_sysfs.c

+2 −6
Original line number Diff line number Diff line
@@ -168,8 +168,6 @@ static int create_pnp_modalias(const struct acpi_device *acpi_dev, char *modalia 
			continue;



		count = snprintf(&modalias[len], size, "%s:", id->id);

		if (count < 0)

			return -EINVAL;



		if (count >= size)

			return -ENOMEM;
@@ -177,7 +175,7 @@ static int create_pnp_modalias(const struct acpi_device *acpi_dev, char *modalia 
		len += count;

		size -= count;

	}

	modalias[len] = '\0';



	return len;

}
@@ -228,8 +226,6 @@ static int create_of_modalias(const struct acpi_device *acpi_dev, char *modalias 
	for (i = 0; i < nval; i++, obj++) {

		count = snprintf(&modalias[len], size, "C%s",

				 obj->string.pointer);

		if (count < 0)

			return -EINVAL;



		if (count >= size)

			return -ENOMEM;
@@ -237,7 +233,7 @@ static int create_of_modalias(const struct acpi_device *acpi_dev, char *modalias 
		len += count;

		size -= count;

	}

	modalias[len] = '\0';



	return len;

}