ide-acpi: cleanup do_drive_get_GTF() (2f0d0fd2) · Commits · 戴 / test

* ide_noacpi is already checked by ide_acpi_exec_tfs() which is the only user of do_drive_get_GTF(). * ide_acpi_exec_tfs() prints sufficient debug info about the device so no need to have excessive data about port/host. * It is sufficient to check for drive->acpidata->obj_handle as it will be NULL if dev == NULL or hwif->acpidata == NULL or device is not present. Signed-off-by:

Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/ide-acpi.c

+0 −27

Original line number	Diff line number	Diff line
		@@ -219,39 +219,12 @@ static int do_drive_get_GTF(ide_drive_t *drive,
		acpi_status status;
		struct acpi_buffer output;
		union acpi_object *out_obj;
		ide_hwif_t *hwif = drive->hwif;
		struct device *dev = hwif->gendev.parent;
		int err = -ENODEV;
		int port;

		*gtf_length = 0;
		*gtf_address = 0UL;
		*obj_loc = 0UL;

		if (ide_noacpi)
		return 0;

		if (!dev) {
		DEBPRINT("no PCI device for %s\n", hwif->name);
		goto out;
		}

		if (!hwif->acpidata) {
		DEBPRINT("no ACPI data for %s\n", hwif->name);
		goto out;
		}

		port = hwif->channel ? drive->dn - 2: drive->dn;

		DEBPRINT("ENTER: %s at %s, port#: %d, hard_port#: %d\n",
		hwif->name, dev_name(dev), port, hwif->channel);

		if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) {
		DEBPRINT("%s drive %d:%d not present\n",
		hwif->name, hwif->channel, port);
		goto out;
		}

		if (!drive->acpidata->obj_handle) {
		DEBPRINT("No ACPI object found for %s\n", drive->name);
		goto out;

Admin message