diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-08 23:52:23 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-13 13:41:39 +0100 |
| commit | 38475b3be1517a16d263b0b04dae862bf7027d48 (patch) | |
| tree | 811cf3cf543724af813907dbd6df024009b55c6a /drivers/acpi/scan.c | |
| parent | ACPI: Unbind ACPI drv when probe failed (diff) | |
| download | linux-38475b3be1517a16d263b0b04dae862bf7027d48.tar.xz linux-38475b3be1517a16d263b0b04dae862bf7027d48.zip | |
ACPI / scan: Remove useless #ifndef from acpi_eject_store()
Since the FORCE_EJECT symbol is never defined, the
#ifndef FORCE_EJECT in acpi_eject_store() is always true, so drop it.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Tested-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Reviewed-by: Toshi Kani <toshi.kani@hp.com>
Tested-by: Toshi Kani <toshi.kani@hp.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index bf6e2c26f52d..5bc2641fba8a 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -202,12 +202,10 @@ acpi_eject_store(struct device *d, struct device_attribute *attr, if ((!count) || (buf[0] != '1')) { return -EINVAL; } -#ifndef FORCE_EJECT if (!acpi_device->driver && !acpi_device->handler) { ret = -ENODEV; goto err; } -#endif status = acpi_get_type(acpi_device->handle, &type); if (ACPI_FAILURE(status) || (!acpi_device->flags.ejectable)) { ret = -ENODEV; |