Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db1461ad authored by Kay Sievers's avatar Kay Sievers Committed by Len Brown
Browse files

ACPI: struct device - replace bus_id with dev_name(), dev_set_name() 



Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent fc5a9f88

drivers/acpi/glue.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -255,12 +255,12 @@ static int acpi_platform_notify(struct device *dev) 
	}

	}

	type = acpi_get_bus_type(dev->bus);

	type = acpi_get_bus_type(dev->bus);

	if (!type) {

	if (!type) {

		DBG("No ACPI bus support for %s\n", dev->bus_id);

		DBG("No ACPI bus support for %s\n", dev_name(dev));

		ret = -EINVAL;

		ret = -EINVAL;

		goto end;

		goto end;

	}

	}

	if ((ret = type->find_device(dev, &handle)) != 0)

	if ((ret = type->find_device(dev, &handle)) != 0)

		DBG("Can't get handler for %s\n", dev->bus_id);

		DBG("Can't get handler for %s\n", dev_name(dev));

      end:

      end:

	if (!ret)

	if (!ret)

		acpi_bind_one(dev, handle);

		acpi_bind_one(dev, handle);
@@ -271,10 +271,10 @@ static int acpi_platform_notify(struct device *dev) 




		acpi_get_name(dev->archdata.acpi_handle,

		acpi_get_name(dev->archdata.acpi_handle,

			      ACPI_FULL_PATHNAME, &buffer);

			      ACPI_FULL_PATHNAME, &buffer);

		DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer);

		DBG("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer);

		kfree(buffer.pointer);

		kfree(buffer.pointer);

	} else

	} else

		DBG("Device %s -> No ACPI support\n", dev->bus_id);

		DBG("Device %s -> No ACPI support\n", dev_name(dev));

#endif

#endif





	return ret;

	return ret;