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

Commit 1131b938 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: remove acpi_device.flags.hardware_id 



Every acpi_device has at least one ID (if there's no _HID or _CID, we
give it a synthetic or default ID).  So there's no longer a need to
check whether an ID exists; we can just use it.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent b2972f87

drivers/acpi/scan.c

+13 −24
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias, 
	int count;

	struct acpi_hardware_id *id;



	if (!acpi_dev->flags.hardware_id)

		return -ENODEV;



	len = snprintf(modalias, size, "acpi:");

	size -= len;
@@ -203,17 +200,13 @@ static int acpi_device_setup_files(struct acpi_device *dev) 
			goto end;

	}



	if (dev->flags.hardware_id) {

	result = device_create_file(&dev->dev, &dev_attr_hid);

	if (result)

		goto end;

	}



	if (dev->flags.hardware_id) {

	result = device_create_file(&dev->dev, &dev_attr_modalias);

	if (result)

		goto end;

	}



        /*

         * If device has _EJ0, 'eject' file is created that is used to trigger
@@ -239,10 +232,7 @@ static void acpi_device_remove_files(struct acpi_device *dev) 
	if (ACPI_SUCCESS(status))

		device_remove_file(&dev->dev, &dev_attr_eject);



	if (dev->flags.hardware_id)

	device_remove_file(&dev->dev, &dev_attr_modalias);



	if (dev->flags.hardware_id)

	device_remove_file(&dev->dev, &dev_attr_hid);

	if (dev->handle)

		device_remove_file(&dev->dev, &dev_attr_path);
@@ -474,7 +464,8 @@ static int acpi_device_register(struct acpi_device *device) 
	 * If failed, create one and link it into acpi_bus_id_list

	 */

	list_for_each_entry(acpi_device_bus_id, &acpi_bus_id_list, node) {

		if (!strcmp(acpi_device_bus_id->bus_id, device->flags.hardware_id ? acpi_device_hid(device) : "device")) {

		if (!strcmp(acpi_device_bus_id->bus_id,

			    acpi_device_hid(device))) {

			acpi_device_bus_id->instance_no++;

			found = 1;

			kfree(new_bus_id);
@@ -483,7 +474,7 @@ static int acpi_device_register(struct acpi_device *device) 
	}

	if (!found) {

		acpi_device_bus_id = new_bus_id;

		strcpy(acpi_device_bus_id->bus_id, device->flags.hardware_id ? acpi_device_hid(device) : "device");

		strcpy(acpi_device_bus_id->bus_id, acpi_device_hid(device));

		acpi_device_bus_id->instance_no = 0;

		list_add_tail(&acpi_device_bus_id->node, &acpi_bus_id_list);

	}
@@ -1103,10 +1094,8 @@ static void acpi_device_set_id(struct acpi_device *device) 
	if (!hid && !cid_list && !cid_add)

		hid = "device";



	if (hid) {

	if (hid)

		acpi_add_id(device, hid);

		device->flags.hardware_id = 1;

	}

	if (uid) {

		device->pnp.unique_id = ACPI_ALLOCATE_ZEROED(strlen (uid) + 1);

		if (device->pnp.unique_id) {

drivers/pnp/pnpacpi/core.c

+1 −2
Original line number Diff line number Diff line
@@ -230,8 +230,7 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp) 
	struct pnp_dev *pnp = _pnp;



	/* true means it matched */

	return acpi->flags.hardware_id

	    && !acpi_get_physical_device(acpi->handle)

	return !acpi_get_physical_device(acpi->handle)

	    && compare_pnp_id(pnp->id, acpi_device_hid(acpi));

}

include/acpi/acpi_bus.h

+1 −2
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ struct acpi_device_status { 


struct acpi_device_flags {

	u32 dynamic_status:1;

	u32 hardware_id:1;

	u32 bus_address:1;

	u32 unique_id:1;

	u32 removable:1;
@@ -152,7 +151,7 @@ struct acpi_device_flags { 
	u32 performance_manageable:1;

	u32 wake_capable:1;	/* Wakeup(_PRW) supported? */

	u32 force_power_state:1;

	u32 reserved:20;

	u32 reserved:21;

};



/* File System */