Commit 673aa1ed authored Apr 04, 2023 by Miquel Raynal Committed by Greg Kroah-Hartman Apr 05, 2023

of: Rename of_modalias_node()



This helper does not produce a real modalias, but tries to get the
"product" compatible part of the "vendor,product" compatibles only. It
is far from creating a purely useful modalias string and does not seem
to be used like that directly anyway, so let's try to give this helper a
more meaningful name before moving there a real modalias helper (already
existing under of/device.c).

Also update the various documentations to refer to the strings as
"aliases" rather than "modaliases" which has a real meaning in the Linux
kernel.

There is no functional change.

Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Wolfram Sang <wsa@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Sebastian Reichel <sre@kernel.org>
Link: https://lore.kernel.org/r/20230404172148.82422-9-srinivas.kandagatla@linaro.org


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 5c3d15e1

drivers/acpi/bus.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -817,9 +817,10 @@ static bool acpi_of_modalias(struct acpi_device *adev,
		* @modalias: Pointer to buffer that modalias value will be copied into
		* @len: Length of modalias buffer
		*
		* This is a counterpart of of_modalias_node() for struct acpi_device objects.
		* If there is a compatible string for @adev, it will be copied to @modalias
		* with the vendor prefix stripped; otherwise, @default_id will be used.
		* This is a counterpart of of_alias_from_compatible() for struct acpi_device
		* objects. If there is a compatible string for @adev, it will be copied to
		* @modalias with the vendor prefix stripped; otherwise, @default_id will be
		* used.
		*/
		void acpi_set_modalias(struct acpi_device adev, const char default_id,
		char *modalias, size_t len)

drivers/gpu/drm/drm_mipi_dsi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ of_mipi_dsi_device_add(struct mipi_dsi_host host, struct device_node node)
		int ret;
		u32 reg;

		if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) {
		if (of_alias_from_compatible(node, info.type, sizeof(info.type)) < 0) {
		drm_err(host, "modalias failure on %pOF\n", node);
		return ERR_PTR(-EINVAL);
		}

drivers/hsi/hsi_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
		if (!cl)
		return;

		err = of_modalias_node(client, name, sizeof(name));
		err = of_alias_from_compatible(client, name, sizeof(name));
		if (err)
		goto err;

drivers/i2c/busses/i2c-powermac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ static bool i2c_powermac_get_type(struct i2c_adapter *adap,
		*/

		/* First try proper modalias */
		if (of_modalias_node(node, tmp, sizeof(tmp)) >= 0) {
		if (of_alias_from_compatible(node, tmp, sizeof(tmp)) >= 0) {
		snprintf(type, type_size, "MAC,%s", tmp);
		return true;
		}

drivers/i2c/i2c-core-of.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ int of_i2c_get_board_info(struct device dev, struct device_node node,

		memset(info, 0, sizeof(*info));

		if (of_modalias_node(node, info->type, sizeof(info->type)) < 0) {
		if (of_alias_from_compatible(node, info->type, sizeof(info->type)) < 0) {
		dev_err(dev, "of_i2c: modalias failure on %pOF\n", node);
		return -EINVAL;
		}