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

Commit 66a9099e authored by Adrian Bunk's avatar Adrian Bunk Committed by Jeff Garzik
Browse files

libata-acpi.c: remove unneeded #if's 



These #if's are unneeded since they:
- did anyway not handle the CONFIG_ACPI_DOCK_MODULE case correctly and
- this is already handled in include/acpi/acpi_drivers.h and
- it's now correctly handled in kconfig.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Acked-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent a0b9f4bc

drivers/ata/libata-acpi.c

+0 −4
Original line number Diff line number Diff line
@@ -227,11 +227,9 @@ void ata_acpi_associate(struct ata_host *host) 
			acpi_install_notify_handler(ap->acpi_handle,

						    ACPI_SYSTEM_NOTIFY,

						    ata_acpi_ap_notify, ap);

#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)

			/* we might be on a docking station */

			register_hotplug_dock_device(ap->acpi_handle,

						     ata_acpi_ap_notify, ap);

#endif

		}



		for (j = 0; j < ata_link_max_devices(&ap->link); j++) {
@@ -241,11 +239,9 @@ void ata_acpi_associate(struct ata_host *host) 
				acpi_install_notify_handler(dev->acpi_handle,

						ACPI_SYSTEM_NOTIFY,

						ata_acpi_dev_notify, dev);

#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)

				/* we might be on a docking station */

				register_hotplug_dock_device(dev->acpi_handle,

						ata_acpi_dev_notify, dev);

#endif

			}

		}

	}